1.8.52 Toolbar layout is saved now. qt4-port
authorinsilmaril
Tue Aug 15 11:42:10 2006 +0000 (2006-08-15)
branchqt4-port
changeset 139aadd0f58300
parent 12 58e7594239df
child 14 f4c37956d28d
1.8.52 Toolbar layout is saved now.
aboutdialog.cpp
demos/todo.vym
main.cpp
mainwindow.cpp
mainwindow.h
mapeditor.cpp
tex/vym.changelog
texteditor.cpp
toolbars.cpp
toolbars.h
version.h
vym.pro
     1.1 --- a/aboutdialog.cpp	Tue Aug 01 09:31:22 2006 +0000
     1.2 +++ b/aboutdialog.cpp	Tue Aug 15 11:42:10 2006 +0000
     1.3 @@ -190,6 +190,6 @@
     1.4  void AboutTextBrowser::setSource(const QUrl &url )
     1.5  {
     1.6  	QProcess *proc= new QProcess ();
     1.7 -	proc->start( settings.readEntry("/vym/mainwindow/readerURL"),QStringList ()<<url.toString());
     1.8 +	proc->start( settings.value("/vym/mainwindow/readerURL"),QStringList ()<<url.toString());
     1.9  	if (!proc->waitForStarted() &&mainWindow->settingsURL() ) setSource(url);
    1.10  }
     2.1 Binary file demos/todo.vym has changed
     3.1 --- a/main.cpp	Tue Aug 01 09:31:22 2006 +0000
     3.2 +++ b/main.cpp	Tue Aug 15 11:42:10 2006 +0000
     3.3 @@ -128,6 +128,8 @@
     3.4  
     3.5  int main(int argc, char** argv)
     3.6  {
     3.7 +//FIXME	Q_INIT_RESOURCE (application);
     3.8 +
     3.9      QApplication app(argc,argv);
    3.10  
    3.11  
    3.12 @@ -153,7 +155,7 @@
    3.13  	if (options.isOn ("version"))
    3.14  	{
    3.15  		cout << "vym version "<<__VYM_VERSION
    3.16 -			<<"  (c) 2004 Uwe Drechsel - "
    3.17 +			<<"  (c) 2004-2006 Uwe Drechsel - "
    3.18  			<<__BUILD_DATE<<endl;
    3.19  			
    3.20  		return 0;	
     4.1 --- a/mainwindow.cpp	Tue Aug 01 09:31:22 2006 +0000
     4.2 +++ b/mainwindow.cpp	Tue Aug 15 11:42:10 2006 +0000
     4.3 @@ -155,10 +155,8 @@
     4.4  	setCaption ("VYM - View Your Mind");
     4.5  
     4.6  	// Load window settings
     4.7 -	resize (settings.readNumEntry( "/vym/mainwindow/geometry/width", 800),
     4.8 -	        settings.readNumEntry( "/vym/mainwindow/geometry/height",600));
     4.9 -	move   (settings.readNumEntry( "/vym/mainwindow/geometry/posX", 100),
    4.10 -	        settings.readNumEntry( "/vym/mainwindow/geometry/posY", 100));
    4.11 +	resize (settings.value( "/mainwindow/geometry/size",QSize (800,600)).toSize());
    4.12 +	move   (settings.value( "/mainwindow/geometry/pos", QPoint(300,100)).toPoint());
    4.13  
    4.14  
    4.15  	// Create unique temporary directory
    4.16 @@ -183,30 +181,30 @@
    4.17  	QString p,s;
    4.18  
    4.19  		// application to open URLs
    4.20 -		p="/vym/mainwindow/readerURL";
    4.21 +		p="/mainwindow/readerURL";
    4.22  		#if defined(Q_OS_LINUX)
    4.23 -			s=settings.readEntry (p,"konqueror");
    4.24 +			s=settings.value (p,"konqueror").toString();
    4.25  		#else
    4.26  			#if defined(Q_OS_MACX)
    4.27 -				s=settings.readEntry (p,"/usr/bin/open");
    4.28 +				s=settings.value (p,"/usr/bin/open").toString();
    4.29  			#else
    4.30 -				s=settings.readEntry (p,"mozilla");
    4.31 +				s=settings.value (p,"mozilla");
    4.32  			#endif
    4.33  		#endif
    4.34 -		settings.writeEntry( p,s);
    4.35 +		settings.setValue( p,s);
    4.36  
    4.37  		// application to open PDFs
    4.38 -		p="/vym/mainwindow/readerPDF";
    4.39 +		p="/mainwindow/readerPDF";
    4.40  		#if defined(Q_OS_LINUX)
    4.41 -			s=settings.readEntry (p,"acroread");
    4.42 +			s=settings.value (p,"acroread").toString();
    4.43  		#else
    4.44  			#if defined(Q_OS_MACX)
    4.45 -				s=settings.readEntry (p,"/usr/bin/open");
    4.46 +				s=settings.value (p,"/usr/bin/open").toString();
    4.47  			#else
    4.48 -				s=settings.readEntry (p,"acroread");
    4.49 +				s=settings.value (p,"acroread").toString();
    4.50  			#endif
    4.51  		#endif
    4.52 -		settings.writeEntry( p,s);
    4.53 +		settings.setValue( p,s);
    4.54  
    4.55  	
    4.56  	maxLastMaps=9;
    4.57 @@ -226,23 +224,12 @@
    4.58  	setupFlagActions();
    4.59      setupSettingsActions();
    4.60  	setupContextMenus();
    4.61 -    if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false)) setupTestActions();
    4.62 +    if (settings.value( "/mainwindow/showTestMenu",false).toBool()) setupTestActions();
    4.63      setupHelpActions();
    4.64      
    4.65 -	// After menu is created, we can enable some actions
    4.66 -//FIXME  QT3 testing	actionFilePrint->setEnabled (true);
    4.67 -
    4.68      statusBar();
    4.69  
    4.70 -	// Position toolbars
    4.71 -	settings.beginGroup("/vym/mainwindow/toolbars/standardFlags");
    4.72 -	TB_standardFlags->move(settings.value("pos").toPoint());
    4.73 -	cout << "moving TB to pos="<<settings.value("pos").toPoint()<<endl;
    4.74 -// FIXME proceed here...	
    4.75 -//	TB_standardFlags->setOrientation(settings.value("orientation").toInt());
    4.76 -//	TB_standardFlags->setVisible(settings.value<QVariant::Bool>("visible",true));
    4.77 -	settings.endGroup();
    4.78 -
    4.79 +	restoreState (settings.value("/mainwindow/state",0).toByteArray());
    4.80  
    4.81  	// Initialize Find window
    4.82  	findWindow=new FindWindow(NULL,"findwindow");
    4.83 @@ -260,38 +247,30 @@
    4.84  Main::~Main()
    4.85  {
    4.86  	// Save Settings
    4.87 -	settings.writeEntry( "/vym/mainwindow/geometry/width", width() );
    4.88 -	settings.writeEntry( "/vym/mainwindow/geometry/height", height() );
    4.89 -	settings.writeEntry( "/vym/mainwindow/geometry/posX", pos().x() );
    4.90 -	settings.writeEntry( "/vym/mainwindow/geometry/posY", pos().y() );
    4.91 -
    4.92 -	settings.beginGroup ("/vym/mainwindow/toolbar/standardFlags");
    4.93 -	settings.setValue ("pos",TB_standardFlags->pos());
    4.94 -	settings.setValue ("visible",TB_standardFlags->isVisible());
    4.95 -	settings.setValue ("orientation",TB_standardFlags->orientation());
    4.96 -	settings.endGroup();
    4.97 -
    4.98 -	settings.writeEntry( "/vym/mainwindow/toobar/posY", pos().y() );
    4.99 -
   4.100 -	settings.writeEntry( "/vym/version/version", __VYM_VERSION );
   4.101 -	settings.writeEntry( "/vym/version/builddate", __BUILD_DATE );
   4.102 -
   4.103 -	settings.writeEntry( "/vym/mapeditor/editmode/autoselectheading",actionSettingsAutoselectHeading->isOn() );
   4.104 -	settings.writeEntry( "/vym/mapeditor/editmode/autoselecttext",actionSettingsAutoselectText->isOn() );
   4.105 -	settings.writeEntry( "/vym/mapeditor/editmode/pastenewheading",actionSettingsPasteNewHeading->isOn() );
   4.106 -	settings.writeEntry( "/vym/mapeditor/editmode/autoedit",actionSettingsAutoedit->isOn() );
   4.107 -	settings.writeEntry( "/vym/mapeditor/editmode/useDelKey",actionSettingsUseDelKey->isOn() );
   4.108 -	settings.writeEntry( "/vym/mapeditor/editmode/useFlagGroups",actionSettingsUseFlagGroups->isOn() );
   4.109 -	settings.writeEntry( "/vym/export/useHideExport",actionSettingsUseHideExport->isOn() );
   4.110 +	settings.setValue ( "/mainwindow/geometry/size", size() );
   4.111 +	settings.setValue ( "/mainwindow/geometry/pos", pos() );
   4.112 +
   4.113 +	settings.setValue ("/mainwindow/state",saveState(0));
   4.114 +
   4.115 +	settings.setValue( "/version/version", __VYM_VERSION );
   4.116 +	settings.setValue( "/version/builddate", __BUILD_DATE );
   4.117 +
   4.118 +	settings.setValue( "/mapeditor/editmode/autoselectheading",actionSettingsAutoselectHeading->isOn() );
   4.119 +	settings.setValue( "/mapeditor/editmode/autoselecttext",actionSettingsAutoselectText->isOn() );
   4.120 +	settings.setValue( "/mapeditor/editmode/pastenewheading",actionSettingsPasteNewHeading->isOn() );
   4.121 +	settings.setValue( "/mapeditor/editmode/autoedit",actionSettingsAutoedit->isOn() );
   4.122 +	settings.setValue( "/mapeditor/editmode/useDelKey",actionSettingsUseDelKey->isOn() );
   4.123 +	settings.setValue( "/mapeditor/editmode/useFlagGroups",actionSettingsUseFlagGroups->isOn() );
   4.124 +	settings.setValue( "/export/useHideExport",actionSettingsUseHideExport->isOn() );
   4.125  
   4.126  	QString s;
   4.127  	int maps=lastMaps.count();
   4.128 -	settings.writeEntry( "/vym/lastMaps/number",maps );
   4.129 +	settings.setValue( "/lastMaps/number",maps );
   4.130  	for (int i=1;i<=maps;i++)
   4.131  	{
   4.132 -		s=QString("/vym/lastMaps/map-%1").arg(i);
   4.133 +		s=QString("/lastMaps/map-%1").arg(i);
   4.134  		if (!s.isEmpty() && i<=maxLastMaps) 
   4.135 -			settings.writeEntry (s, lastMaps.at(i-1));
   4.136 +			settings.setValue (s, lastMaps.at(i-1));
   4.137  	}
   4.138  
   4.139  
   4.140 @@ -334,8 +313,8 @@
   4.141  // File Actions
   4.142  void Main::setupFileActions()
   4.143  {
   4.144 -	QMenu *fileMenu = menuBar()->addMenu ( tr ("&File") );
   4.145 -    QToolBar *tb = addToolBar( tr ("&File") );
   4.146 +	QMenu *fileMenu = menuBar()->addMenu ( tr ("&Map") );
   4.147 +    QToolBar *tb = addToolBar( tr ("&Map") );
   4.148  
   4.149      QAction *a;
   4.150      a = new QAction(QPixmap( iconPath+"filenew.png"), tr( "&New..." ),this);
   4.151 @@ -343,14 +322,14 @@
   4.152  	a->setShortcut ( Qt::CTRL + Qt::Key_N );
   4.153      a->addTo( tb );
   4.154  	fileMenu->addAction (a);
   4.155 -    connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
   4.156 +    connect( a, SIGNAL( triggered() ), this, SLOT( fileNew() ) );
   4.157  	
   4.158      a = new QAction( QPixmap( iconPath+"fileopen.png"), tr( "&Open..." ),this);
   4.159  	a->setStatusTip (tr( "Open","File menu" ) );
   4.160  	a->setShortcut ( Qt::CTRL + Qt::Key_O );
   4.161      a->addTo( tb );
   4.162  	fileMenu->addAction (a);
   4.163 -    connect( a, SIGNAL( activated() ), this, SLOT( fileLoad() ) );
   4.164 +    connect( a, SIGNAL( triggered() ), this, SLOT( fileLoad() ) );
   4.165  	
   4.166  	fileLastMapsMenu = fileMenu->addMenu (tr("Open Recent"));
   4.167  	fileMenu->addSeparator();
   4.168 @@ -360,13 +339,13 @@
   4.169  	a->setShortcut (Qt::CTRL + Qt::Key_S );
   4.170      a->addTo( tb );
   4.171  	fileMenu->addAction (a);
   4.172 -    connect( a, SIGNAL( activated() ), this, SLOT( fileSave() ) );
   4.173 +    connect( a, SIGNAL( triggered() ), this, SLOT( fileSave() ) );
   4.174  	actionFileSave=a;
   4.175  	
   4.176      a = new QAction( QPixmap(iconPath+"filesaveas.png"), tr( "Save &As..." ), this);
   4.177  	a->setStatusTip (tr( "Save &As" ) );
   4.178  	fileMenu->addAction (a);
   4.179 -    connect( a, SIGNAL( activated() ), this, SLOT( fileSaveAs() ) );
   4.180 +    connect( a, SIGNAL( triggered() ), this, SLOT( fileSaveAs() ) );
   4.181  
   4.182  	fileMenu->addSeparator();
   4.183  
   4.184 @@ -375,67 +354,67 @@
   4.185  	a = new QAction(tr("KDE Bookmarks"), this);
   4.186  	a->setStatusTip ( tr( "Import")+" "+tr("KDE Bookmarks" ));
   4.187  	a->addTo (fileImportMenu);
   4.188 -	connect( a, SIGNAL( activated() ), this, SLOT( fileImportKDEBookmarks() ) );
   4.189 -
   4.190 -    if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false)) 
   4.191 +	connect( a, SIGNAL( triggered() ), this, SLOT( fileImportKDEBookmarks() ) );
   4.192 +
   4.193 +    if (settings.value( "/mainwindow/showTestMenu",false).toBool()) 
   4.194  	{
   4.195  		a = new QAction( QPixmap(), tr("Firefox Bookmarks"),this);
   4.196  		a->setStatusTip (tr( "Import")+" "+tr("Firefox Bookmarks" ) );
   4.197  		a->addTo (fileImportMenu);
   4.198 -		connect( a, SIGNAL( activated() ), this, SLOT( fileImportFirefoxBookmarks() ) );
   4.199 +		connect( a, SIGNAL( triggered() ), this, SLOT( fileImportFirefoxBookmarks() ) );
   4.200  	}	
   4.201  
   4.202  	a = new QAction("Mind Manager...",this);
   4.203  	a->setStatusTip ( tr( "Import")+" Mind Manager"  );
   4.204  	fileImportMenu->addAction (a);
   4.205 -	connect( a, SIGNAL( activated() ), this, SLOT( fileImportMM() ) );
   4.206 +	connect( a, SIGNAL( triggered() ), this, SLOT( fileImportMM() ) );
   4.207  
   4.208      a = new QAction( tr( "Import Dir"+QString("...") ), this);
   4.209  	a->setStatusTip (tr( "Import directory structure (experimental)" ) );
   4.210  	fileImportMenu->addAction (a);
   4.211 -    connect( a, SIGNAL( activated() ), this, SLOT( fileImportDir() ) );
   4.212 +    connect( a, SIGNAL( triggered() ), this, SLOT( fileImportDir() ) );
   4.213  
   4.214  	fileExportMenu = fileMenu->addMenu (tr("Export"));
   4.215  
   4.216  	a = new QAction( tr("Image")+QString("..."), this);
   4.217  	a->setStatusTip( tr( "Export map as image" ));
   4.218 -	connect( a, SIGNAL( activated() ), this, SLOT( fileExportImage() ) );
   4.219 +	connect( a, SIGNAL( triggered() ), this, SLOT( fileExportImage() ) );
   4.220  	fileExportMenu->addAction (a);
   4.221  
   4.222  	a = new QAction( "Open Office"+QString("..."), this);
   4.223  	a->setStatusTip( tr( "Export in Open Document Format used e.g. in Open Office " ));
   4.224 -	connect( a, SIGNAL( activated() ), this, SLOT( fileExportOOPresentation() ) );
   4.225 +	connect( a, SIGNAL( triggered() ), this, SLOT( fileExportOOPresentation() ) );
   4.226  	fileExportMenu->addAction (a);
   4.227  
   4.228  	a = new QAction(  "Webpage (XHTML)...",this );
   4.229  	a->setShortcut (Qt::ALT + Qt::Key_X);
   4.230  	a->setStatusTip ( tr( "Export as")+" webpage (XHTML)");
   4.231 -    connect( a, SIGNAL( activated() ), this, SLOT( fileExportXHTML() ) );
   4.232 +    connect( a, SIGNAL( triggered() ), this, SLOT( fileExportXHTML() ) );
   4.233  	fileExportMenu->addAction (a);
   4.234  
   4.235      a = new QAction( "Text (ASCII)...", this);
   4.236  	a->setStatusTip ( tr( "Export as")+" ASCII"+" "+tr("(still experimental)" ));
   4.237 -    connect( a, SIGNAL( activated() ), this, SLOT( fileExportASCII() ) );
   4.238 +    connect( a, SIGNAL( triggered() ), this, SLOT( fileExportASCII() ) );
   4.239  	fileExportMenu->addAction (a);
   4.240  
   4.241  	a = new QAction( tr("KDE Bookmarks"), this);
   4.242  	a->setStatusTip( tr( "Export as")+" "+tr("KDE Bookmarks" ));
   4.243 -	connect( a, SIGNAL( activated() ), this, SLOT( fileExportKDEBookmarks() ) );
   4.244 +	connect( a, SIGNAL( triggered() ), this, SLOT( fileExportKDEBookmarks() ) );
   4.245  	fileExportMenu->addAction (a);
   4.246  
   4.247      a = new QAction( "Taskjuggler...", this );
   4.248      a->setStatusTip( tr( "Export as")+" Taskjuggler"+" "+tr("(still experimental)" ));
   4.249 -    connect( a, SIGNAL( activated() ), this, SLOT( fileExportTaskjuggler() ) );
   4.250 +    connect( a, SIGNAL( triggered() ), this, SLOT( fileExportTaskjuggler() ) );
   4.251  	fileExportMenu->addAction (a);
   4.252  
   4.253      a = new QAction( "LaTeX...", this);
   4.254      a->setStatusTip( tr( "Export as")+" LaTeX"+" "+tr("(still experimental)" ));
   4.255 -    connect( a, SIGNAL( activated() ), this, SLOT( fileExportLaTeX() ) );
   4.256 +    connect( a, SIGNAL( triggered() ), this, SLOT( fileExportLaTeX() ) );
   4.257  	fileExportMenu->addAction (a);
   4.258  
   4.259  	a = new QAction( "XML..." , this );
   4.260  	a->setStatusTip (tr( "Export as")+" XML");
   4.261 -    connect( a, SIGNAL( activated() ), this, SLOT( fileExportXML() ) );
   4.262 +    connect( a, SIGNAL( triggered() ), this, SLOT( fileExportXML() ) );
   4.263  	fileExportMenu->addAction (a);
   4.264  
   4.265  	fileMenu->addSeparator();
   4.266 @@ -445,34 +424,34 @@
   4.267  	a->setShortcut (Qt::CTRL + Qt::Key_P );
   4.268      a->addTo( tb );
   4.269  	fileMenu->addAction (a);
   4.270 -    connect( a, SIGNAL( activated() ), this, SLOT( filePrint() ) );
   4.271 +    connect( a, SIGNAL( triggered() ), this, SLOT( filePrint() ) );
   4.272  	actionFilePrint=a;
   4.273  
   4.274      a = new QAction( QPixmap(iconPath+"fileclose.png"), tr( "&Close Map" ), this);
   4.275  	a->setStatusTip (tr( "Close Map" ) );
   4.276  	a->setShortcut (Qt::ALT + Qt::Key_C );
   4.277  	fileMenu->addAction (a);
   4.278 -    connect( a, SIGNAL( activated() ), this, SLOT( fileCloseMap() ) );
   4.279 +    connect( a, SIGNAL( triggered() ), this, SLOT( fileCloseMap() ) );
   4.280  
   4.281      a = new QAction(QPixmap(iconPath+"exit.png"), tr( "E&xit")+" "+__VYM, this);
   4.282  	a->setStatusTip ( tr( "Exit")+" "+__VYM );
   4.283  	a->setShortcut (Qt::CTRL + Qt::Key_Q );
   4.284  	fileMenu->addAction (a);
   4.285 -    connect( a, SIGNAL( activated() ), this, SLOT( fileExitVYM() ) );
   4.286 +    connect( a, SIGNAL( triggered() ), this, SLOT( fileExitVYM() ) );
   4.287  }
   4.288  
   4.289  
   4.290  //Edit Actions
   4.291  void Main::setupEditActions()
   4.292  {
   4.293 -    QToolBar *tb = addToolBar( tr ("&Edit") );
   4.294 +    QToolBar *tb = addToolBar( tr ("&Actions") );
   4.295      tb->setLabel( "Edit Actions" );
   4.296      QMenu *editMenu = menuBar()->addMenu( tr("&Edit") );
   4.297  
   4.298      QAction *a;
   4.299  	QAction *alt;
   4.300      a = new QAction( QPixmap( iconPath+"undo.png"), tr( "&Undo" ),this);
   4.301 -    connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) );
   4.302 +    connect( a, SIGNAL( triggered() ), this, SLOT( editUndo() ) );
   4.303  	a->setStatusTip (tr( "Undo" ) );
   4.304  	a->setShortcut ( Qt::CTRL + Qt::Key_Z );
   4.305  	a->setEnabled (false);
   4.306 @@ -480,13 +459,13 @@
   4.307  	editMenu->addAction (a);
   4.308  	actionEditUndo=a;
   4.309      
   4.310 -    if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false)) 
   4.311 +    if (settings.value( "/mainwindow/showTestMenu",false).toBool()) 
   4.312  	{
   4.313  		a = new QAction( QPixmap( iconPath+"redo.png"), tr( "&Redo" ), this); 
   4.314  		a->setStatusTip (tr( "Redo" ));
   4.315  		a->setShortcut (Qt::CTRL + Qt::Key_Y );
   4.316  		editMenu->addAction (a);
   4.317 -		connect( a, SIGNAL( activated() ), this, SLOT( editRedo() ) );
   4.318 +		connect( a, SIGNAL( triggered() ), this, SLOT( editRedo() ) );
   4.319  	}
   4.320     
   4.321  	editMenu->addSeparator();
   4.322 @@ -496,7 +475,7 @@
   4.323  	a->setEnabled (false);
   4.324      tb->addAction (a);
   4.325  	editMenu->addAction (a);
   4.326 -    connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) );
   4.327 +    connect( a, SIGNAL( triggered() ), this, SLOT( editCopy() ) );
   4.328  	actionEditCopy=a;
   4.329  	
   4.330      a = new QAction(QPixmap( iconPath+"editcut.png" ), tr( "Cu&t" ), this);
   4.331 @@ -506,10 +485,10 @@
   4.332      tb->addAction (a);
   4.333  	editMenu->addAction (a);
   4.334  	actionEditCut=a;
   4.335 -    connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
   4.336 +    connect( a, SIGNAL( triggered() ), this, SLOT( editCut() ) );
   4.337  	
   4.338      a = new QAction(QPixmap( iconPath+"editpaste.png"), tr( "&Paste" ),this);
   4.339 -    connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
   4.340 +    connect( a, SIGNAL( triggered() ), this, SLOT( editPaste() ) );
   4.341  	a->setStatusTip ( tr( "Paste" ) );
   4.342  	a->setShortcut ( Qt::CTRL + Qt::Key_V );
   4.343  	a->setEnabled (false);
   4.344 @@ -530,7 +509,7 @@
   4.345  	a->setShortcut (Qt::Key_Return );
   4.346  	a->setShortcutContext (Qt::WindowShortcut);
   4.347  	addAction (a);
   4.348 -    connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
   4.349 +    connect( a, SIGNAL( triggered() ), this, SLOT( editHeading() ) );
   4.350  	actionListBranches.append(a);
   4.351  	editMenu->addAction (a);
   4.352  	actionEditHeading=a;
   4.353 @@ -539,7 +518,7 @@
   4.354  	a->setShortcut ( Qt::Key_F2 );
   4.355  	a->setShortcutContext (Qt::WindowShortcut);
   4.356  	addAction (a);
   4.357 -    connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
   4.358 +    connect( a, SIGNAL( triggered() ), this, SLOT( editHeading() ) );
   4.359  	actionListBranches.append(a);
   4.360      
   4.361      // Shortcut to delete selection
   4.362 @@ -548,7 +527,7 @@
   4.363  	a->setShortcut ( Qt::Key_Delete);
   4.364  	a->setShortcutContext (Qt::WindowShortcut);
   4.365  	addAction (a);
   4.366 -    connect( a, SIGNAL( activated() ), this, SLOT( editDeleteSelection() ) );
   4.367 +    connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteSelection() ) );
   4.368  	actionEditDelete=a;
   4.369      
   4.370      // Shortcut to add branch
   4.371 @@ -557,11 +536,11 @@
   4.372  	alt->setShortcut (Qt::Key_A);
   4.373  	alt->setShortcutContext (Qt::WindowShortcut);
   4.374  	addAction (alt);
   4.375 -	connect( alt, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
   4.376 +	connect( alt, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) );
   4.377  	a = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child" ), this);
   4.378  	a->setStatusTip ( tr( "Add a branch as child of selection" ));
   4.379  	a->setShortcut (Qt::Key_Insert);	
   4.380 -    connect( a, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
   4.381 +	connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) );
   4.382  	actionListBranches.append(a);
   4.383  	#if defined (Q_OS_MACX)
   4.384  		// In OSX show different shortcut in menues, the keys work indepently always			
   4.385 @@ -579,7 +558,7 @@
   4.386  	a->setShortcut (Qt::ALT + Qt::Key_Insert );
   4.387  	a->setShortcutContext (Qt::WindowShortcut);
   4.388  	addAction (a);
   4.389 -    connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) );
   4.390 +    connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchHere() ) );
   4.391  	a->setEnabled (false);
   4.392  	actionListBranches.append(a);
   4.393  	actionEditAddBranchHere=a;
   4.394 @@ -588,7 +567,7 @@
   4.395  	a->setShortcut ( Qt::ALT + Qt::Key_A );
   4.396  	a->setShortcutContext (Qt::WindowShortcut);
   4.397  	addAction (a);
   4.398 -    connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) );
   4.399 +    connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchHere() ) );
   4.400  	actionListBranches.append(a);
   4.401  
   4.402  	// Add branch above
   4.403 @@ -597,7 +576,7 @@
   4.404  	a->setShortcut (Qt::SHIFT+Qt::Key_Insert );
   4.405  	a->setShortcutContext (Qt::WindowShortcut);
   4.406  	addAction (a);
   4.407 -    connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) );
   4.408 +    connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchAbove() ) );
   4.409  	a->setEnabled (false);
   4.410  	actionListBranches.append(a);
   4.411  	actionEditAddBranchAbove=a;
   4.412 @@ -606,7 +585,7 @@
   4.413  	a->setShortcut (Qt::SHIFT+Qt::Key_A );
   4.414  	a->setShortcutContext (Qt::WindowShortcut);
   4.415  	addAction (a);
   4.416 -    connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) );
   4.417 +    connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchAbove() ) );
   4.418  	actionListBranches.append(a);
   4.419  
   4.420  	// Add branch below 
   4.421 @@ -615,7 +594,7 @@
   4.422  	a->setShortcut (Qt::CTRL +Qt::Key_Insert );
   4.423  	a->setShortcutContext (Qt::WindowShortcut);
   4.424  	addAction (a);
   4.425 -    connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) );
   4.426 +    connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBelow() ) );
   4.427  	a->setEnabled (false);
   4.428  	actionListBranches.append(a);
   4.429  	actionEditAddBranchBelow=a;
   4.430 @@ -624,7 +603,7 @@
   4.431  	a->setShortcut (Qt::CTRL +Qt::Key_A );
   4.432  	a->setShortcutContext (Qt::WindowShortcut);
   4.433  	addAction (a);
   4.434 -    connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) );
   4.435 +    connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBelow() ) );
   4.436  	actionListBranches.append(a);
   4.437  
   4.438      a = new QAction(QPixmap(iconPath+"up.png" ), tr( "Move up" ), this);
   4.439 @@ -633,11 +612,11 @@
   4.440  	a->setEnabled (false);
   4.441      tb->addAction (a);
   4.442  	editMenu->addAction (a);
   4.443 -    connect( a, SIGNAL( activated() ), this, SLOT( editMoveUp() ) );
   4.444 +    connect( a, SIGNAL( triggered() ), this, SLOT( editMoveUp() ) );
   4.445  	actionEditMoveUp=a;
   4.446  
   4.447      a = new QAction( QPixmap( iconPath+"down.png"), tr( "Move down" ),this);
   4.448 -    connect( a, SIGNAL( activated() ), this, SLOT( editMoveDown() ) );
   4.449 +    connect( a, SIGNAL( triggered() ), this, SLOT( editMoveDown() ) );
   4.450  	a->setStatusTip (tr( "Move branch down" ) );
   4.451  	a->setShortcut ( Qt::Key_PageDown );
   4.452  	a->setEnabled (false);
   4.453 @@ -649,11 +628,11 @@
   4.454  	a = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ),this);
   4.455  	a->setShortcut ( Qt::Key_ScrollLock );
   4.456  	a->setStatusTip (tr( "Scroll branch" ) );
   4.457 -    connect( a, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
   4.458 +    connect( a, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
   4.459  	alt = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ), this);
   4.460  	alt->setShortcut ( Qt::Key_S );
   4.461  	alt->setStatusTip (tr( "Scroll branch" )); 
   4.462 -    connect( alt, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
   4.463 +    connect( alt, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
   4.464  	#if defined(Q_OS_MACX)
   4.465  		actionEditToggleScroll=alt;
   4.466  	#else	
   4.467 @@ -669,7 +648,7 @@
   4.468      a = new QAction( tr( "Unscroll all scrolled branches" ), this);
   4.469  	a->setStatusTip (tr( "Unscroll all" ));
   4.470  	editMenu->addAction (a);
   4.471 -    connect( a, SIGNAL( activated() ), this, SLOT( editUnScrollAll() ) );
   4.472 +    connect( a, SIGNAL( triggered() ), this, SLOT( editUnScrollAll() ) );
   4.473  	
   4.474  	editMenu->addSeparator();
   4.475  
   4.476 @@ -677,7 +656,7 @@
   4.477  	a->setStatusTip (tr( "Find" ) );
   4.478  	a->setShortcut (Qt::CTRL + Qt::Key_F );
   4.479  	editMenu->addAction (a);
   4.480 -    connect( a, SIGNAL( activated() ), this, SLOT( editOpenFindWindow() ) );
   4.481 +    connect( a, SIGNAL( triggered() ), this, SLOT( editOpenFindWindow() ) );
   4.482      
   4.483  	editMenu->addSeparator();
   4.484  
   4.485 @@ -686,14 +665,14 @@
   4.486  	a->setShortcut (tr( "Open URL" ));
   4.487      tb->addAction (a);
   4.488  	addAction(a);
   4.489 -    connect( a, SIGNAL( activated() ), this, SLOT( editOpenURL() ) );
   4.490 +    connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURL() ) );
   4.491  	actionEditOpenURL=a;
   4.492  
   4.493  	a = new QAction( tr( "Open URL in new tab" ), this);
   4.494  	a->setStatusTip (tr( "Open URL in new tab" ));
   4.495  	a->setShortcut (Qt::CTRL+Qt::Key_U );
   4.496  	addAction(a);
   4.497 -    connect( a, SIGNAL( activated() ), this, SLOT( editOpenURLTab() ) );
   4.498 +    connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURLTab() ) );
   4.499  	actionEditOpenURLTab=a;
   4.500  
   4.501  	a = new QAction(QPixmap(), tr( "Edit URL"+QString("...") ), this);
   4.502 @@ -703,48 +682,48 @@
   4.503  	a->setShortcutContext (Qt::WindowShortcut);
   4.504  	actionListBranches.append(a);
   4.505  	addAction(a);
   4.506 -    connect( a, SIGNAL( activated() ), this, SLOT( editURL() ) );
   4.507 +    connect( a, SIGNAL( triggered() ), this, SLOT( editURL() ) );
   4.508  	actionEditURL=a;
   4.509  	
   4.510  	a = new QAction( tr( "Use heading for URL" ), this);
   4.511  	a->setStatusTip ( tr( "Use heading of selected branch as URL" ));
   4.512  	a->setEnabled (false);
   4.513  	actionListBranches.append(a);
   4.514 -    connect( a, SIGNAL( activated() ), this, SLOT( editHeading2URL() ) );
   4.515 +    connect( a, SIGNAL( triggered() ), this, SLOT( editHeading2URL() ) );
   4.516  	actionEditHeading2URL=a;
   4.517      
   4.518  	a = new QAction(tr( "Create URL to Bugzilla" ), this);
   4.519  	a->setStatusTip ( tr( "Create URL to Bugzilla" ));
   4.520  	a->setEnabled (false);
   4.521  	actionListBranches.append(a);
   4.522 -    connect( a, SIGNAL( activated() ), this, SLOT( editBugzilla2URL() ) );
   4.523 +    connect( a, SIGNAL( triggered() ), this, SLOT( editBugzilla2URL() ) );
   4.524  	actionEditBugzilla2URL=a;
   4.525      
   4.526  	a = new QAction(tr( "Create URL to FATE" ), this);
   4.527  	a->setStatusTip ( tr( "Create URL to FATE" ));
   4.528  	a->setEnabled (false);
   4.529  	actionListBranches.append(a);
   4.530 -    connect( a, SIGNAL( activated() ), this, SLOT( editFATE2URL() ) );
   4.531 +    connect( a, SIGNAL( triggered() ), this, SLOT( editFATE2URL() ) );
   4.532  	actionEditFATE2URL=a;
   4.533  	
   4.534      a = new QAction(QPixmap(flagsPath+"flag-vymlink.png"), tr( "Jump to map" ), this);
   4.535  	a->setStatusTip ( tr( "Jump to another vym map, if needed load it first" ));
   4.536      tb->addAction (a);
   4.537  	a->setEnabled (false);
   4.538 -    connect( a, SIGNAL( activated() ), this, SLOT( editOpenVymLink() ) );
   4.539 +    connect( a, SIGNAL( triggered() ), this, SLOT( editOpenVymLink() ) );
   4.540  	actionEditOpenVymLink=a;
   4.541  	
   4.542      a = new QAction(tr( "Edit vym link"+QString("...") ), this);
   4.543  	a->setEnabled (false);
   4.544  	a->setStatusTip ( tr( "Edit link to another vym map" ));
   4.545 -    connect( a, SIGNAL( activated() ), this, SLOT( editVymLink() ) );
   4.546 +    connect( a, SIGNAL( triggered() ), this, SLOT( editVymLink() ) );
   4.547  	actionListBranches.append(a);
   4.548  	actionEditVymLink=a;
   4.549  
   4.550      a = new QAction(tr( "Delete vym link" ),this);
   4.551  	a->setStatusTip ( tr( "Delete link to another vym map" ));
   4.552  	a->setEnabled (false);
   4.553 -    connect( a, SIGNAL( activated() ), this, SLOT( editDeleteVymLink() ) );
   4.554 +    connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteVymLink() ) );
   4.555  	actionEditDeleteVymLink=a;
   4.556  
   4.557      a = new QAction(QPixmap(flagsPath+"flag-hideexport.png"), tr( "Hide in exports" ), this);
   4.558 @@ -753,13 +732,13 @@
   4.559  	a->setToggleAction(true);
   4.560      tb->addAction (a);
   4.561  	a->setEnabled (false);
   4.562 -    connect( a, SIGNAL( activated() ), this, SLOT( editToggleHideExport() ) );
   4.563 +    connect( a, SIGNAL( triggered() ), this, SLOT( editToggleHideExport() ) );
   4.564  	actionEditToggleHideExport=a;
   4.565  
   4.566      a = new QAction(tr( "Edit Map Info"+QString("...") ),this);
   4.567  	a->setStatusTip ( tr( "Edit Map Info" ));
   4.568  	a->setEnabled (true);
   4.569 -    connect( a, SIGNAL( activated() ), this, SLOT( editMapInfo() ) );
   4.570 +    connect( a, SIGNAL( triggered() ), this, SLOT( editMapInfo() ) );
   4.571  	actionEditMapInfo=a;
   4.572  
   4.573  	editMenu->addSeparator();
   4.574 @@ -767,7 +746,7 @@
   4.575  	// Import at selection (adding to selection)
   4.576      a = new QAction( tr( "Add map (insert)" ),this);
   4.577  	a->setStatusTip (tr( "Add map at selection" ));
   4.578 -    connect( a, SIGNAL( activated() ), this, SLOT( editImportAdd() ) );
   4.579 +    connect( a, SIGNAL( triggered() ), this, SLOT( editImportAdd() ) );
   4.580  	a->setEnabled (false);
   4.581  	actionListBranches.append(a);
   4.582  	actionEditImportAdd=a;
   4.583 @@ -775,7 +754,7 @@
   4.584  	// Import at selection (replacing selection)
   4.585      a = new QAction( tr( "Add map (replace)" ), this);
   4.586  	a->setStatusTip (tr( "Replace selection with map" ));
   4.587 -    connect( a, SIGNAL( activated() ), this, SLOT( editImportReplace() ) );
   4.588 +    connect( a, SIGNAL( triggered() ), this, SLOT( editImportReplace() ) );
   4.589  	a->setEnabled (false);
   4.590  	actionListBranches.append(a);
   4.591  	actionEditImportReplace=a;
   4.592 @@ -783,7 +762,7 @@
   4.593  	// Save selection 
   4.594      a = new QAction( tr( "Save selection" ), this);
   4.595  	a->setStatusTip (tr( "Save selection" ));
   4.596 -    connect( a, SIGNAL( activated() ), this, SLOT( editSaveBranch() ) );
   4.597 +    connect( a, SIGNAL( triggered() ), this, SLOT( editSaveBranch() ) );
   4.598  	a->setEnabled (false);
   4.599  	actionListBranches.append(a);
   4.600  	actionEditSaveBranch=a;
   4.601 @@ -792,7 +771,7 @@
   4.602      a = new QAction(tr( "Remove only branch " ), this);
   4.603  	a->setStatusTip ( tr( "Remove only branch and keep its childs" ));
   4.604  	a->setShortcut (Qt::ALT + Qt::Key_Delete );
   4.605 -    connect( a, SIGNAL( activated() ), this, SLOT( editRemoveBranchKeepChilds() ) );
   4.606 +    connect( a, SIGNAL( triggered() ), this, SLOT( editRemoveBranchKeepChilds() ) );
   4.607  	a->setEnabled (false);
   4.608  	actionListBranches.append(a);
   4.609  	actionEditRemoveBranchKeepChilds=a;
   4.610 @@ -801,7 +780,7 @@
   4.611      a = new QAction( tr( "Remove childs" ), this);
   4.612  	a->setStatusTip (tr( "Remove childs of branch" ));
   4.613  	a->setShortcut (Qt::SHIFT + Qt::Key_Delete );
   4.614 -    connect( a, SIGNAL( activated() ), this, SLOT( editRemoveChilds() ) );
   4.615 +    connect( a, SIGNAL( triggered() ), this, SLOT( editRemoveChilds() ) );
   4.616  	a->setEnabled (false);
   4.617  	actionListBranches.append(a);
   4.618  	actionEditRemoveChilds=a;
   4.619 @@ -812,25 +791,25 @@
   4.620  	a->setShortcut (Qt::Key_Up );
   4.621  	a->setShortcutContext (Qt::WindowShortcut);
   4.622  	addAction (a);
   4.623 -    connect( a, SIGNAL( activated() ), this, SLOT( editUpperBranch() ) );
   4.624 +    connect( a, SIGNAL( triggered() ), this, SLOT( editUpperBranch() ) );
   4.625      a = new QAction( tr( "Select lower branch" ),this);
   4.626  	a->setStatusTip (tr( "Select lower branch" ));
   4.627  	a->setShortcut ( Qt::Key_Down );
   4.628  	a->setShortcutContext (Qt::WindowShortcut);
   4.629  	addAction (a);
   4.630 -    connect( a, SIGNAL( activated() ), this, SLOT( editLowerBranch() ) );
   4.631 +    connect( a, SIGNAL( triggered() ), this, SLOT( editLowerBranch() ) );
   4.632      a = new QAction(tr( "Select left branch" ), this);
   4.633  	a->setStatusTip ( tr( "Select left branch" ));
   4.634  	a->setShortcut (Qt::Key_Left );
   4.635  	a->setShortcutContext (Qt::WindowShortcut);
   4.636  	addAction (a);
   4.637 -    connect( a, SIGNAL( activated() ), this, SLOT( editLeftBranch() ) );
   4.638 +    connect( a, SIGNAL( triggered() ), this, SLOT( editLeftBranch() ) );
   4.639      a = new QAction( tr( "Select child branch" ), this);
   4.640  	a->setStatusTip (tr( "Select right branch" ));
   4.641  	a->setShortcut (Qt::Key_Right);
   4.642  	a->setShortcutContext (Qt::WindowShortcut);
   4.643  	addAction (a);
   4.644 -    connect( a, SIGNAL( activated() ), this, SLOT( editRightBranch() ) );
   4.645 +    connect( a, SIGNAL( triggered() ), this, SLOT( editRightBranch() ) );
   4.646      a = new QAction( tr( "Select first branch" ), this);
   4.647  	a->setStatusTip (tr( "Select first branch" ));
   4.648  	a->setShortcut (Qt::Key_Home );
   4.649 @@ -840,13 +819,13 @@
   4.650  	editMenu->addAction (a);
   4.651  	actionListBranches.append(a);
   4.652  	actionEditSelectFirst=a;
   4.653 -    connect( a, SIGNAL( activated() ), this, SLOT( editFirstBranch() ) );
   4.654 +    connect( a, SIGNAL( triggered() ), this, SLOT( editFirstBranch() ) );
   4.655      a = new QAction( tr( "Select last branch" ),this);
   4.656  	a->setStatusTip (tr( "Select last branch" ));
   4.657  	a->setShortcut ( Qt::Key_End );
   4.658  	a->setShortcutContext (Qt::WindowShortcut);
   4.659  	addAction (a);
   4.660 -    connect( a, SIGNAL( activated() ), this, SLOT( editLastBranch() ) );
   4.661 +    connect( a, SIGNAL( triggered() ), this, SLOT( editLastBranch() ) );
   4.662  	a->setEnabled (false);
   4.663  	editMenu->addAction (a);
   4.664  	actionListBranches.append(a);
   4.665 @@ -854,7 +833,7 @@
   4.666  
   4.667      a = new QAction( tr( "Add Image" )+QString("..."), this);
   4.668  	a->setStatusTip (tr( "Add Image" ));
   4.669 -    connect( a, SIGNAL( activated() ), this, SLOT( editLoadImage() ) );
   4.670 +    connect( a, SIGNAL( triggered() ), this, SLOT( editLoadImage() ) );
   4.671  	actionEditLoadImage=a;
   4.672  
   4.673  }
   4.674 @@ -870,14 +849,14 @@
   4.675      pix.fill (Qt::black);
   4.676      a= new QAction(pix, tr( "Set &Color" )+QString("..."), this);
   4.677  	a->setStatusTip ( tr( "Set Color" ));
   4.678 -    connect( a, SIGNAL( activated() ), this, SLOT( formatSelectColor() ) );
   4.679 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatSelectColor() ) );
   4.680      a->addTo( tb );
   4.681  	formatMenu->addAction (a);
   4.682  	actionFormatColor=a;
   4.683      a= new QAction( QPixmap(iconPath+"formatcolorpicker.png"), tr( "Pic&k color" ), this);
   4.684  	a->setStatusTip (tr( "Pick color\nHint: You can pick a color from another branch and color using CTRL+Left Button" ) );
   4.685  	a->setShortcut (Qt::CTRL + Qt::Key_K );
   4.686 -    connect( a, SIGNAL( activated() ), this, SLOT( formatPickColor() ) );
   4.687 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatPickColor() ) );
   4.688  	a->setEnabled (false);
   4.689      a->addTo( tb );
   4.690  	formatMenu->addAction (a);
   4.691 @@ -887,7 +866,7 @@
   4.692      a= new QAction(QPixmap(iconPath+"formatcoloritem.png"), tr( "Color &branch" ), this);
   4.693  	a->setStatusTip ( tr( "Color branch" ) );
   4.694  	a->setShortcut (Qt::CTRL + Qt::Key_I);
   4.695 -    connect( a, SIGNAL( activated() ), this, SLOT( formatColorItem() ) );
   4.696 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatColorItem() ) );
   4.697  	a->setEnabled (false);
   4.698      a->addTo( tb );
   4.699  	formatMenu->addAction (a);
   4.700 @@ -897,7 +876,7 @@
   4.701      a= new QAction(QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color sub&tree" ), this);
   4.702  	a->setStatusTip ( tr( "Color Subtree" ));
   4.703  	a->setShortcut (Qt::CTRL + Qt::Key_T);
   4.704 -    connect( a, SIGNAL( activated() ), this, SLOT( formatColorBranch() ) );
   4.705 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatColorBranch() ) );
   4.706  	a->setEnabled (false);
   4.707  	formatMenu->addAction (a);
   4.708      a->addTo( tb );
   4.709 @@ -910,26 +889,26 @@
   4.710      a= new QAction( tr( "Linkstyle Line" ), actionGroupFormatLinkStyles);
   4.711  	a->setStatusTip (tr( "Line" ));
   4.712  	a->setToggleAction(true);
   4.713 -    connect( a, SIGNAL( activated() ), this, SLOT( formatLinkStyleLine() ) );
   4.714 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatLinkStyleLine() ) );
   4.715  	formatMenu->addAction (a);
   4.716  	actionFormatLinkStyleLine=a;
   4.717      a= new QAction( tr( "Linkstyle Parabel" ), actionGroupFormatLinkStyles);
   4.718  	a->setStatusTip (tr( "Line" ));
   4.719  	a->setToggleAction(true);
   4.720 -    connect( a, SIGNAL( activated() ), this, SLOT( formatLinkStyleParabel() ) );
   4.721 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatLinkStyleParabel() ) );
   4.722  	formatMenu->addAction (a);
   4.723  	actionFormatLinkStyleParabel=a;
   4.724      a= new QAction( tr( "Linkstyle Thick Line" ), actionGroupFormatLinkStyles );
   4.725  	a->setStatusTip (tr( "PolyLine" ));
   4.726  	a->setToggleAction(true);
   4.727 -    connect( a, SIGNAL( activated() ), this, SLOT( formatLinkStylePolyLine() ) );
   4.728 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatLinkStylePolyLine() ) );
   4.729  	formatMenu->addAction (a);
   4.730  	actionFormatLinkStylePolyLine=a;
   4.731      a= new QAction( tr( "Linkstyle Thick Parabel" ), actionGroupFormatLinkStyles);
   4.732  	a->setStatusTip (tr( "PolyParabel" ) );
   4.733  	a->setToggleAction(true);
   4.734  	a->setChecked (true);
   4.735 -    connect( a, SIGNAL( activated() ), this, SLOT( formatLinkStylePolyParabel() ) );
   4.736 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatLinkStylePolyParabel() ) );
   4.737  	formatMenu->addAction (a);
   4.738  	actionFormatLinkStylePolyParabel=a;
   4.739  	
   4.740 @@ -938,37 +917,37 @@
   4.741      a = new QAction( tr( "No Frame" ), actionGroupFormatFrameTypes );
   4.742  	a->setStatusTip (tr("No Frame"));
   4.743  	a->setToggleAction(true);
   4.744 -    connect( a, SIGNAL( activated() ), this, SLOT( formatFrameNone() ) );
   4.745 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatFrameNone() ) );
   4.746  	actionFormatFrameNone=a;
   4.747      a = new QAction( tr( "Rectangle" ), actionGroupFormatFrameTypes);
   4.748  	a->setStatusTip (tr( "Rectangle" ));
   4.749  	a->setToggleAction(true);
   4.750 -    connect( a, SIGNAL( activated() ), this, SLOT( formatFrameRectangle() ) );
   4.751 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatFrameRectangle() ) );
   4.752  	actionFormatFrameRectangle=a;
   4.753  
   4.754      a = new QAction( tr( "Include images vertically" ),  actionFormatIncludeImagesVer);
   4.755  	a->setStatusTip ( tr ("Include top and bottom position of images into branch"));
   4.756  	a->setToggleAction(true);
   4.757 -    connect( a, SIGNAL( activated() ), this, SLOT( formatIncludeImagesVer() ) );
   4.758 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatIncludeImagesVer() ) );
   4.759  	actionFormatIncludeImagesVer=a;
   4.760  
   4.761      a = new QAction( tr( "Include images horizontally" ),  actionFormatIncludeImagesHor );
   4.762  	a->setStatusTip ( tr ("Include left and right position of images into branch"));
   4.763  	a->setToggleAction(true);
   4.764 -    connect( a, SIGNAL( activated() ), this, SLOT( formatIncludeImagesHor() ) );
   4.765 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatIncludeImagesHor() ) );
   4.766  	actionFormatIncludeImagesHor=a;
   4.767  
   4.768      a = new QAction( tr( "Hide link if object is not selected" ), actionFormatHideLinkUnselected);
   4.769  	a->setStatusTip (tr( "Hide link" ));
   4.770  	a->setToggleAction(true);
   4.771 -    connect( a, SIGNAL( activated() ), this, SLOT( formatHideLinkUnselected() ) );
   4.772 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatHideLinkUnselected() ) );
   4.773  	actionFormatHideLinkUnselected=a;
   4.774  
   4.775  	formatMenu->addSeparator();
   4.776      a= new QAction( tr( "&Use color of heading for link" ),  this);
   4.777  	a->setStatusTip (tr( "Use same color for links and headings" ));
   4.778  	a->setToggleAction(true);
   4.779 -    connect( a, SIGNAL( activated() ), this, SLOT( formatToggleLinkColorHint() ) );
   4.780 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatToggleLinkColorHint() ) );
   4.781  	formatMenu->addAction (a);
   4.782  	actionFormatLinkColorHint=a;
   4.783  
   4.784 @@ -976,13 +955,13 @@
   4.785      a= new QAction( pix, tr( "Set &Link Color"+QString("...") ), this  );
   4.786  	a->setStatusTip (tr( "Set Link Color" ));
   4.787  	formatMenu->addAction (a);
   4.788 -    connect( a, SIGNAL( activated() ), this, SLOT( formatSelectLinkColor() ) );
   4.789 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatSelectLinkColor() ) );
   4.790      actionFormatLinkColor=a;
   4.791  
   4.792      a= new QAction( pix, tr( "Set &Background Color" )+QString("..."), this );
   4.793  	a->setStatusTip (tr( "Set Background Color" ));
   4.794  	formatMenu->addAction (a);
   4.795 -    connect( a, SIGNAL( activated() ), this, SLOT( formatSelectBackColor() ) );
   4.796 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatSelectBackColor() ) );
   4.797      actionFormatBackColor=a;
   4.798  }
   4.799  
   4.800 @@ -999,21 +978,21 @@
   4.801  	a->setShortcut (Qt::CTRL + Qt::Key_0 );
   4.802      a->addTo( tb );
   4.803  	viewMenu->addAction (a);
   4.804 -    connect( a, SIGNAL( activated() ), this, SLOT(viewZoomReset() ) );
   4.805 +    connect( a, SIGNAL( triggered() ), this, SLOT(viewZoomReset() ) );
   4.806  	
   4.807      a = new QAction( QPixmap(iconPath+"viewmag+.png"), tr( "Zoom in" ), this);
   4.808  	a->setStatusTip (tr( "Zoom in" ));
   4.809  	a->setShortcut (Qt::CTRL + Qt::Key_Plus);
   4.810      a->addTo( tb );
   4.811  	viewMenu->addAction (a);
   4.812 -    connect( a, SIGNAL( activated() ), this, SLOT(viewZoomIn() ) );
   4.813 +    connect( a, SIGNAL( triggered() ), this, SLOT(viewZoomIn() ) );
   4.814  	
   4.815      a = new QAction( QPixmap(iconPath+"viewmag-.png"), tr( "Zoom out" ), this);
   4.816  	a->setStatusTip (tr( "Zoom out" ));
   4.817  	a->setShortcut (Qt::CTRL + Qt::Key_Minus );
   4.818      a->addTo( tb );
   4.819  	viewMenu->addAction (a);
   4.820 -    connect( a, SIGNAL( activated() ), this, SLOT( viewZoomOut() ) );
   4.821 +    connect( a, SIGNAL( triggered() ), this, SLOT( viewZoomOut() ) );
   4.822  
   4.823  
   4.824      a = new QAction(QPixmap(flagsPath+"flag-note.png"), tr( "Show Note Editor" ),this);
   4.825 @@ -1026,7 +1005,7 @@
   4.826  		a->setOn(false);
   4.827      a->addTo( tb );
   4.828  	viewMenu->addAction (a);
   4.829 -    connect( a, SIGNAL( activated() ), this, SLOT(windowToggleNoteEditor() ) );
   4.830 +    connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleNoteEditor() ) );
   4.831  	actionViewToggleNoteEditor=a;
   4.832  
   4.833      a = new QAction(  tr( "Show history window" ),this );
   4.834 @@ -1034,20 +1013,20 @@
   4.835  	a->setShortcut ( Qt::CTRL + Qt::Key_H  );
   4.836  	a->setToggleAction(false);
   4.837  	viewMenu->addAction (a);
   4.838 -    connect( a, SIGNAL( activated() ), this, SLOT(windowToggleHistory() ) );
   4.839 +    connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleHistory() ) );
   4.840  	actionViewToggleHistoryWindow=a;
   4.841  
   4.842      a = new QAction(tr( "Next Window" ), this);
   4.843  	a->setStatusTip ( tr( "&Next Window" ) );
   4.844  	a->setShortcut (Qt::ALT + Qt::Key_N );
   4.845  	viewMenu->addAction (a);
   4.846 -    connect( a, SIGNAL( activated() ), this, SLOT(windowNextEditor() ) );
   4.847 +    connect( a, SIGNAL( triggered() ), this, SLOT(windowNextEditor() ) );
   4.848  
   4.849      a = new QAction (tr( "Previous Window" ), this );
   4.850  	a->setStatusTip (tr( "&Previous Window" ));
   4.851  	a->setShortcut (Qt::ALT + Qt::Key_P );
   4.852  	viewMenu->addAction (a);
   4.853 -    connect( a, SIGNAL( activated() ), this, SLOT(windowPreviousEditor() ) );
   4.854 +    connect( a, SIGNAL( triggered() ), this, SLOT(windowPreviousEditor() ) );
   4.855  }
   4.856  
   4.857  // Mode Actions
   4.858 @@ -1124,12 +1103,14 @@
   4.859  
   4.860  	// Create Standard Flags
   4.861  	QToolBar *tb=addToolBar (tr ("Standard Flags","Standard Flag Toolbar"));
   4.862 -	TB_standardFlags=tb;
   4.863 +	//FIXMEtoolbars.add (tb);
   4.864  
   4.865  	standardFlagsDefault = new FlagRowObj ();
   4.866  	standardFlagsDefault->setVisibility (false);
   4.867  	standardFlagsDefault->setName ("standardFlagsDef");
   4.868  	standardFlagsDefault->setToolBar (tb);
   4.869 +	TB_standardFlags=tb;
   4.870 +	tb->setObjectName ("standardFlagTB");
   4.871  
   4.872  	fo->load(QPixmap(flagsPath+"flag-exclamationmark.png"));
   4.873  	fo->setName ("exclamationmark");
   4.874 @@ -1140,7 +1121,7 @@
   4.875  	a->setCheckable(true);
   4.876  	a->setObjectName(fo->getName());
   4.877  	a->setToolTip(tr("Take care!","Standardflag"));
   4.878 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.879 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.880  	standardFlagsDefault->addFlag (fo);	// makes deep copy
   4.881  	
   4.882  	fo->load(QPixmap(flagsPath+"flag-questionmark.png"));
   4.883 @@ -1152,7 +1133,7 @@
   4.884  	a->setCheckable(true);
   4.885  	a->setObjectName(fo->getName());
   4.886  	a->setToolTip(tr("Really?","Standardflag"));
   4.887 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.888 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.889  	standardFlagsDefault->addFlag (fo);	
   4.890  
   4.891  	fo->load(QPixmap(flagsPath+"flag-hook-green.png"));
   4.892 @@ -1164,7 +1145,7 @@
   4.893  	a->setCheckable(true);
   4.894  	a->setObjectName(fo->getName());
   4.895  	a->setToolTip(tr("ok!","Standardflag"));
   4.896 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.897 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.898  	standardFlagsDefault->addFlag (fo);	
   4.899  
   4.900  	fo->load(QPixmap(flagsPath+"flag-cross-red.png"));
   4.901 @@ -1176,7 +1157,7 @@
   4.902  	a->setCheckable(true);
   4.903  	a->setObjectName(fo->getName());
   4.904  	a->setToolTip(tr("Not ok!","Standardflag"));
   4.905 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.906 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.907  	standardFlagsDefault->addFlag (fo);	
   4.908  
   4.909  	fo->load(QPixmap(flagsPath+"flag-stopsign.png"));
   4.910 @@ -1187,7 +1168,7 @@
   4.911  	a->setCheckable(true);
   4.912  	a->setObjectName(fo->getName());
   4.913  	a->setToolTip(tr("This won't work!","Standardflag"));
   4.914 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.915 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.916  	standardFlagsDefault->addFlag (fo);	
   4.917  
   4.918  	fo->load(QPixmap(flagsPath+"flag-smiley-good.png"));
   4.919 @@ -1199,7 +1180,7 @@
   4.920  	a->setCheckable(true);
   4.921  	a->setObjectName(fo->getName());
   4.922  	a->setToolTip(tr("Good","Standardflag"));
   4.923 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.924 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.925  	standardFlagsDefault->addFlag (fo);	
   4.926  
   4.927  	fo->load(QPixmap(flagsPath+"flag-smiley-sad.png"));
   4.928 @@ -1211,7 +1192,7 @@
   4.929  	a->setCheckable(true);
   4.930  	a->setObjectName(fo->getName());
   4.931  	a->setToolTip(tr("Bad","Standardflag"));
   4.932 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.933 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.934  	standardFlagsDefault->addFlag (fo);	
   4.935  
   4.936  	fo->load(QPixmap(flagsPath+"flag-smiley-omg.png"));
   4.937 @@ -1224,7 +1205,7 @@
   4.938  	a->setCheckable(true);
   4.939  	a->setObjectName(fo->getName());
   4.940  	a->setToolTip(tr("Oh no!","Standardflag"));
   4.941 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.942 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.943  	standardFlagsDefault->addFlag (fo);	
   4.944  
   4.945  	fo->load(QPixmap(flagsPath+"flag-kalarm.png"));
   4.946 @@ -1235,7 +1216,7 @@
   4.947  	a->setCheckable(true);
   4.948  	a->setObjectName(fo->getName());
   4.949  	a->setToolTip(tr("Time critical","Standardflag"));
   4.950 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.951 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.952  	standardFlagsDefault->addFlag (fo);	
   4.953  
   4.954  	fo->load(QPixmap(flagsPath+"flag-phone.png"));
   4.955 @@ -1246,7 +1227,7 @@
   4.956  	a->setCheckable(true);
   4.957  	a->setObjectName(fo->getName());
   4.958  	a->setToolTip(tr("Call...","Standardflag"));
   4.959 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.960 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.961  	standardFlagsDefault->addFlag (fo);	
   4.962  
   4.963  	fo->load(QPixmap(flagsPath+"flag-lamp.png"));
   4.964 @@ -1257,7 +1238,7 @@
   4.965  	a->setCheckable(true);
   4.966  	a->setObjectName(fo->getName());
   4.967  	a->setToolTip(tr("Idea!","Standardflag"));
   4.968 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.969 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.970  	standardFlagsDefault->addFlag (fo);	
   4.971  
   4.972  	fo->load(QPixmap(flagsPath+"flag-arrow-up.png"));
   4.973 @@ -1269,7 +1250,7 @@
   4.974  	a->setCheckable(true);
   4.975  	a->setObjectName(fo->getName());
   4.976  	a->setToolTip(tr("Important","Standardflag"));
   4.977 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.978 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.979  	standardFlagsDefault->addFlag (fo);	
   4.980  
   4.981  	fo->load(QPixmap(flagsPath+"flag-arrow-down.png"));
   4.982 @@ -1281,7 +1262,7 @@
   4.983  	a->setCheckable(true);
   4.984  	a->setObjectName(fo->getName());
   4.985  	a->setToolTip(tr("Unimportant","Standardflag"));
   4.986 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.987 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.988  	standardFlagsDefault->addFlag (fo);	
   4.989  
   4.990  	fo->load(QPixmap(flagsPath+"flag-arrow-2up.png"));
   4.991 @@ -1293,7 +1274,7 @@
   4.992  	a->setCheckable(true);
   4.993  	a->setObjectName(fo->getName());
   4.994  	a->setToolTip(tr("Very important!","Standardflag"));
   4.995 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
   4.996 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
   4.997  	standardFlagsDefault->addFlag (fo);	
   4.998  
   4.999  	fo->load(QPixmap(flagsPath+"flag-arrow-2down.png"));
  4.1000 @@ -1305,7 +1286,7 @@
  4.1001  	a->setCheckable(true);
  4.1002  	a->setObjectName(fo->getName());
  4.1003  	a->setToolTip(tr("Very unimportant!","Standardflag"));
  4.1004 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
  4.1005 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
  4.1006  	standardFlagsDefault->addFlag (fo);	
  4.1007  
  4.1008  	fo->load(QPixmap(flagsPath+"flag-thumb-up.png"));
  4.1009 @@ -1317,7 +1298,7 @@
  4.1010  	a->setCheckable(true);
  4.1011  	a->setObjectName(fo->getName());
  4.1012  	a->setToolTip(tr("I like this","Standardflag"));
  4.1013 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
  4.1014 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
  4.1015  	standardFlagsDefault->addFlag (fo);	
  4.1016  
  4.1017  	fo->load(QPixmap(flagsPath+"flag-thumb-down.png"));
  4.1018 @@ -1329,7 +1310,7 @@
  4.1019  	a->setCheckable(true);
  4.1020  	a->setObjectName(fo->getName());
  4.1021  	a->setToolTip(tr("I do not like this","Standardflag"));
  4.1022 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
  4.1023 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
  4.1024  	standardFlagsDefault->addFlag (fo);	
  4.1025  	
  4.1026  	fo->load(QPixmap(flagsPath+"flag-rose.png"));
  4.1027 @@ -1340,7 +1321,7 @@
  4.1028  	a->setCheckable(true);
  4.1029  	a->setObjectName(fo->getName());
  4.1030  	a->setToolTip(tr("Rose","Standardflag"));
  4.1031 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
  4.1032 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
  4.1033  	standardFlagsDefault->addFlag (fo);	
  4.1034  
  4.1035  	fo->load(QPixmap(flagsPath+"flag-heart.png"));
  4.1036 @@ -1350,7 +1331,7 @@
  4.1037  	a->setCheckable(true);
  4.1038  	a->setObjectName(fo->getName());
  4.1039  	a->setToolTip(tr("I just love... ","Standardflag"));
  4.1040 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
  4.1041 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
  4.1042  	standardFlagsDefault->addFlag (fo);	
  4.1043  
  4.1044  	fo->load(QPixmap(flagsPath+"flag-present.png"));
  4.1045 @@ -1361,7 +1342,7 @@
  4.1046  	a->setCheckable(true);
  4.1047  	a->setObjectName(fo->getName());
  4.1048  	a->setToolTip(tr("Surprise!","Standardflag"));
  4.1049 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
  4.1050 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
  4.1051  	standardFlagsDefault->addFlag (fo);	
  4.1052  
  4.1053  	fo->load(QPixmap(flagsPath+"flag-flash.png"));
  4.1054 @@ -1372,7 +1353,7 @@
  4.1055  	a->setCheckable(true);
  4.1056  	a->setObjectName(fo->getName());
  4.1057  	a->setToolTip(tr("Dangerous","Standardflag"));
  4.1058 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
  4.1059 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
  4.1060  	standardFlagsDefault->addFlag (fo);	
  4.1061  	
  4.1062  	fo->load(QPixmap(flagsPath+"flag-info.png"));
  4.1063 @@ -1384,7 +1365,7 @@
  4.1064  	a->setCheckable(true);
  4.1065  	a->setObjectName(fo->getName());
  4.1066  	a->setToolTip(tr("Info","Standardflag"));
  4.1067 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
  4.1068 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
  4.1069  	standardFlagsDefault->addFlag (fo);	
  4.1070  
  4.1071  	fo->load(QPixmap(flagsPath+"flag-lifebelt.png"));
  4.1072 @@ -1396,7 +1377,7 @@
  4.1073  	a->setCheckable(true);
  4.1074  	a->setObjectName(fo->getName());
  4.1075  	a->setToolTip(tr("This will help","Standardflag"));
  4.1076 -	connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
  4.1077 +	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
  4.1078  	standardFlagsDefault->addFlag (fo);	
  4.1079  
  4.1080  	delete (fo);
  4.1081 @@ -1411,62 +1392,62 @@
  4.1082  
  4.1083      a = new QAction( tr( "Set application to open pdf files"), this);
  4.1084      a->setStatusTip ( tr( "Set application to open pdf files"));
  4.1085 -    connect( a, SIGNAL( activated() ), this, SLOT( settingsPDF() ) );
  4.1086 +    connect( a, SIGNAL( triggered() ), this, SLOT( settingsPDF() ) );
  4.1087  	settingsMenu->addAction (a);
  4.1088  
  4.1089      a = new QAction( tr( "Set application to open external links"), this);
  4.1090      a->setStatusTip( tr( "Set application to open external links"));
  4.1091 -    connect( a, SIGNAL( activated() ), this, SLOT( settingsURL() ) );
  4.1092 +    connect( a, SIGNAL( triggered() ), this, SLOT( settingsURL() ) );
  4.1093  	settingsMenu->addAction (a);
  4.1094  
  4.1095  	settingsMenu->addSeparator();
  4.1096      a = new QAction( tr( "Edit branch after adding it" ), this );
  4.1097      a->setStatusTip( tr( "Edit branch after adding it" ));
  4.1098  	a->setToggleAction(true);
  4.1099 -	a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/autoedit",true) );
  4.1100 +	a->setOn ( settings.value ("/mapeditor/editmode/autoedit",true).toBool());
  4.1101  	settingsMenu->addAction (a);
  4.1102  	actionSettingsAutoedit=a;
  4.1103  
  4.1104      a= new QAction( tr( "Select branch after adding it" ), this );
  4.1105      a->setStatusTip( tr( "Select branch after adding it" ));
  4.1106  	a->setToggleAction(true);
  4.1107 -	a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/autoselect",false) );
  4.1108 +	a->setOn ( settings.value ("/mapeditor/editmode/autoselect",false).toBool() );
  4.1109  	settingsMenu->addAction (a);
  4.1110  	actionSettingsAutoselectHeading=a;
  4.1111  	
  4.1112      a= new QAction(tr( "Select existing heading" ), this);
  4.1113      a->setStatusTip( tr( "Select heading before editing" ));
  4.1114  	a->setToggleAction(true);
  4.1115 -	a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/autoselectexistingtext",true) );
  4.1116 +	a->setOn ( settings.value ("/mapeditor/editmode/autoselectexistingtext",true).toBool() );
  4.1117  	settingsMenu->addAction (a);
  4.1118  	actionSettingsAutoselectText=a;
  4.1119  	
  4.1120      a= new QAction(tr( "pasting into new branch" ), this );
  4.1121      a->setStatusTip( tr( "Pasting into new branch" ));
  4.1122  	a->setToggleAction(true);
  4.1123 -	a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/newheadingisempty",true) );
  4.1124 +	a->setOn ( settings.value ("/mapeditor/editmode/newheadingisempty",true).toBool() );
  4.1125  	settingsMenu->addAction (a);
  4.1126  	actionSettingsPasteNewHeading=a;
  4.1127  	
  4.1128      a= new QAction( tr( "Delete key" ), this);
  4.1129      a->setStatusTip( tr( "Delete key for deleting branches" ));
  4.1130  	a->setToggleAction(true);
  4.1131 -	a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useDelKey",false) );
  4.1132 +	a->setOn ( settings.value ("/mapeditor/editmode/useDelKey",false).toBool() );
  4.1133  	settingsMenu->addAction (a);
  4.1134 -    connect( a, SIGNAL( activated() ), this, SLOT( settingsToggleDelKey() ) );
  4.1135 +    connect( a, SIGNAL( triggered() ), this, SLOT( settingsToggleDelKey() ) );
  4.1136  	actionSettingsUseDelKey=a;
  4.1137  
  4.1138      a= new QAction( tr( "Exclusive flags" ), this);
  4.1139      a->setStatusTip( tr( "Use exclusive flags in flag toolbars" ));
  4.1140  	a->setToggleAction(true);
  4.1141 -	a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useFlagGroups",true) );
  4.1142 +	a->setOn ( settings.value ("/mapeditor/editmode/useFlagGroups",true).toBool() );
  4.1143  	settingsMenu->addAction (a);
  4.1144  	actionSettingsUseFlagGroups=a;
  4.1145  	
  4.1146      a= new QAction( tr( "Use hide flags" ), this);
  4.1147      a->setStatusTip( tr( "Use hide flag during exports " ));
  4.1148  	a->setToggleAction(true);
  4.1149 -	a->setOn ( settings.readBoolEntry ("/vym/export/useHideExport",true) );
  4.1150 +	a->setOn ( settings.value ("/export/useHideExport",true).toBool() );
  4.1151  	settingsMenu->addAction (a);
  4.1152  	actionSettingsUseHideExport=a;
  4.1153  }
  4.1154 @@ -1479,7 +1460,7 @@
  4.1155      QAction *a;
  4.1156      a = new QAction( tr( "test flag" ), this);
  4.1157      a->setStatusTip( tr( "Call test function" ));
  4.1158 -    connect( a, SIGNAL( activated() ), this, SLOT( testFunction() ) );
  4.1159 +    connect( a, SIGNAL( triggered() ), this, SLOT( testFunction() ) );
  4.1160  	testMenu->addAction (a);
  4.1161  }
  4.1162  
  4.1163 @@ -1491,17 +1472,17 @@
  4.1164      QAction *a;
  4.1165      a = new QAction(  tr( "Open VYM Documentation (pdf) " ), this );
  4.1166      a->setStatusTip( tr( "Open VYM Documentation (pdf)" ));
  4.1167 -    connect( a, SIGNAL( activated() ), this, SLOT( helpDoc() ) );
  4.1168 +    connect( a, SIGNAL( triggered() ), this, SLOT( helpDoc() ) );
  4.1169  	helpMenu->addAction (a);
  4.1170  
  4.1171      a = new QAction( tr( "About VYM" ), this);
  4.1172      a->setStatusTip( tr( "About VYM")+" "__VYM);
  4.1173 -    connect( a, SIGNAL( activated() ), this, SLOT( helpAbout() ) );
  4.1174 +    connect( a, SIGNAL( triggered() ), this, SLOT( helpAbout() ) );
  4.1175  	helpMenu->addAction (a);
  4.1176  
  4.1177      a = new QAction( tr( "About QT" ), this);
  4.1178      a->setStatusTip( tr( "Information about QT toolkit" ));
  4.1179 -    connect( a, SIGNAL( activated() ), this, SLOT( helpAboutQT() ) );
  4.1180 +    connect( a, SIGNAL( triggered() ), this, SLOT( helpAboutQT() ) );
  4.1181  	helpMenu->addAction (a);
  4.1182  }
  4.1183  
  4.1184 @@ -1543,7 +1524,7 @@
  4.1185  	branchContextMenu->addAction ( actionEditURL );
  4.1186  	branchContextMenu->addAction ( actionEditHeading2URL );
  4.1187  	branchContextMenu->addAction ( actionEditBugzilla2URL );
  4.1188 -    if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false)) 
  4.1189 +    if (settings.value( "/mainwindow/showTestMenu",false).toBool() )
  4.1190  	{
  4.1191  		branchContextMenu->addAction ( actionEditFATE2URL );
  4.1192  	}	
  4.1193 @@ -1596,10 +1577,10 @@
  4.1194  	// Menu for last opened files
  4.1195  	// Read settings initially
  4.1196  	QString s;
  4.1197 -	int j=settings.readNumEntry( "/vym/lastMaps/number",0);
  4.1198 +	int j=settings.readNumEntry( "/lastMaps/number",0);
  4.1199  	for (int i=1;i<=j;i++)
  4.1200  	{
  4.1201 -		s=settings.readEntry(QString("/vym/lastMaps/map-%1").arg(i),"");
  4.1202 +		s=settings.value(QString("/lastMaps/map-%1").arg(i),"").toString();
  4.1203  		if (!s.isEmpty() && j<=maxLastMaps) 
  4.1204  			lastMaps.append(s);
  4.1205  	}
  4.1206 @@ -2535,7 +2516,7 @@
  4.1207  	{	
  4.1208  	    QString url=currentMapEditor()->getURL();
  4.1209  		if (url=="") return;
  4.1210 -		QString browser=settings.readEntry("/vym/mainwindow/readerURL" );
  4.1211 +		QString browser=settings.value("/mainwindow/readerURL" ).toString();
  4.1212  		procBrowser = new Q3Process( this );
  4.1213  
  4.1214  		procBrowser->addArgument( browser);
  4.1215 @@ -2558,7 +2539,7 @@
  4.1216  	{	
  4.1217  	    QString url=currentMapEditor()->getURL();
  4.1218  		if (url=="") return;
  4.1219 -		QString browser=settings.readEntry("/vym/mainwindow/readerURL" );
  4.1220 +		QString browser=settings.value("/mainwindow/readerURL" ).toString();
  4.1221  		if (procBrowser && procBrowser->isRunning())
  4.1222  		{
  4.1223  			if (browser.contains("konqueror"))
  4.1224 @@ -2990,9 +2971,9 @@
  4.1225  	bool ok;
  4.1226  	QString text = QInputDialog::getText(
  4.1227  		"VYM", tr("Set application to open PDF files")+":", QLineEdit::Normal,
  4.1228 -		settings.readEntry("/vym/mainwindow/readerPDF"), &ok, this );
  4.1229 +		settings.value("/mainwindow/readerPDF").toString(), &ok, this );
  4.1230  	if (ok)
  4.1231 -		settings.writeEntry ("/vym/mainwindow/readerPDF",text);
  4.1232 +		settings.setValue ("/mainwindow/readerPDF",text);
  4.1233  	return ok;
  4.1234  }
  4.1235  
  4.1236 @@ -3003,10 +2984,10 @@
  4.1237  	bool ok;
  4.1238  	QString text = QInputDialog::getText(
  4.1239  		"VYM", tr("Set application to open an URL")+":", QLineEdit::Normal,
  4.1240 -		settings.readEntry("/vym/mainwindow/readerURL")
  4.1241 +		settings.value("/mainwindow/readerURL").toString()
  4.1242  		, &ok, this );
  4.1243  	if (ok)
  4.1244 -		settings.writeEntry ("/vym/mainwindow/readerURL",text);
  4.1245 +		settings.setValue ("/mainwindow/readerURL",text);
  4.1246  	return ok;
  4.1247  }
  4.1248  
  4.1249 @@ -3074,7 +3055,9 @@
  4.1250  
  4.1251  void Main::testFunction()
  4.1252  {
  4.1253 +	cout <<TB_standardFlags->isMovable()<<endl;
  4.1254  	cout <<TB_standardFlags->pos()<<endl;
  4.1255 +	TB_standardFlags->move(QPoint (0,66));
  4.1256  	//currentMapEditor()->testFunction();
  4.1257  }
  4.1258  
  4.1259 @@ -3114,7 +3097,7 @@
  4.1260  	
  4.1261  	Process *pdfProc = new Process();
  4.1262  	pdfProc->clearArguments();
  4.1263 -	pdfProc->addArgument( settings.readEntry("/vym/mainwindow/readerPDF"));
  4.1264 +	pdfProc->addArgument( settings.value("/mainwindow/readerPDF").toString());
  4.1265  	pdfProc->addArgument( docpath);
  4.1266  
  4.1267  	if ( !pdfProc->start() ) 
     5.1 --- a/mainwindow.h	Tue Aug 01 09:31:22 2006 +0000
     5.2 +++ b/mainwindow.h	Tue Aug 15 11:42:10 2006 +0000
     5.3 @@ -21,6 +21,7 @@
     5.4  #include "findwindow.h"
     5.5  #include "mapeditor.h"
     5.6  #include "texteditor.h"
     5.7 +#include "toolbars.h"
     5.8  #include "xml.h"
     5.9  
    5.10  class Main : public QMainWindow 
    5.11 @@ -184,6 +185,7 @@
    5.12      void helpAboutQT();
    5.13  
    5.14  private:
    5.15 +	ToolBarSet toolbars;
    5.16  	QToolBar *TB_standardFlags;
    5.17  	QTabWidget *tabWidget;
    5.18  	FindWindow *findWindow;
     6.1 --- a/mapeditor.cpp	Tue Aug 01 09:31:22 2006 +0000
     6.2 +++ b/mapeditor.cpp	Tue Aug 15 11:42:10 2006 +0000
     6.3 @@ -159,7 +159,7 @@
     6.4  
     6.5      viewport()->setAcceptDrops(true);
     6.6  
     6.7 -    mapCanvas = new Q3Canvas(1000,800);
     6.8 +    mapCanvas = new Q3Canvas(width(),height());
     6.9  	mapCanvas->setAdvancePeriod(30);
    6.10  	mapCanvas->setBackgroundColor (Qt::white);
    6.11  
    6.12 @@ -219,7 +219,7 @@
    6.13  	fileName=tr("unnamed");
    6.14  	mapName="";
    6.15  
    6.16 -	undosTotal=settings.readNumEntry("/vym/mapeditor/undoLevels",50);
    6.17 +	undosTotal=settings.readNumEntry("/mapeditor/undoLevels",50);
    6.18  	undosAvail=0;	
    6.19  	undoNum=0;
    6.20  	
    6.21 @@ -261,7 +261,7 @@
    6.22  	//cout <<"Destructor MapEditor\n";
    6.23  
    6.24  	// Save Settings
    6.25 -	//settings.writeEntry( "/vym/mapeditor/editmode/autoselect",  );
    6.26 +	//settings.writeEntry( "/mapeditor/editmode/autoselect",  );
    6.27  
    6.28  }
    6.29  
    6.30 @@ -942,7 +942,7 @@
    6.31  	{
    6.32  		printer = new QPrinter;
    6.33  		printer->setColorMode (QPrinter::Color);
    6.34 -		printer->setPrinterName (settings.readEntry("/vym/mainwindow/printerName",printer->printerName()));
    6.35 +		printer->setPrinterName (settings.value("/mainwindow/printerName",printer->printerName()).toString());
    6.36  	}
    6.37  
    6.38  	QRect totalBBox=mapCenter->getTotalBBox();
    6.39 @@ -1062,7 +1062,7 @@
    6.40  		}	
    6.41  
    6.42  		// Save settings in vymrc
    6.43 -		settings.writeEntry("/vym/mainwindow/printerName",printer->printerName());
    6.44 +		settings.writeEntry("/mainwindow/printerName",printer->printerName());
    6.45  	}
    6.46  }
    6.47  
    6.48 @@ -1124,7 +1124,7 @@
    6.49  {
    6.50  	// should be called before and after exports
    6.51  	// depending on the settings
    6.52 -	if (b && settings.value("/vym/export/useHideExport","yes")=="yes")
    6.53 +	if (b && settings.value("/export/useHideExport","yes")=="yes")
    6.54  		setHideTmpMode (HideExport);
    6.55  	else	
    6.56  		setHideTmpMode (HideNone);
    6.57 @@ -1507,8 +1507,9 @@
    6.58  		if (actionSettingsAutoselectText->isOn() && !s.isEmpty() && actionSettingsPasteNewHeading->isOn() )
    6.59  			lineedit->selectAll();
    6.60  		lineedit->show();
    6.61 +		lineedit->setFocus();
    6.62  		lineedit->grabKeyboard();
    6.63 -		lineedit->setFocus();
    6.64 +		cout << "le="<<lineedit<<"  kgrabber="<<keyboardGrabber()<<endl;
    6.65  	}				
    6.66  }
    6.67  
    6.68 @@ -3097,7 +3098,7 @@
    6.69  	dia.setCancelButton (true);
    6.70  	dia.setText("This is a longer \nWarning");
    6.71  	dia.setCaption("Warning: Flux problem");
    6.72 -	dia.setShowAgainName("/vym/warnings/mapeditor");
    6.73 +	dia.setShowAgainName("/warnings/mapeditor");
    6.74  	if (dia.exec()==QDialog::Accepted)
    6.75  		cout << "accepted!\n";
    6.76  	else	
     7.1 --- a/tex/vym.changelog	Tue Aug 01 09:31:22 2006 +0000
     7.2 +++ b/tex/vym.changelog	Tue Aug 15 11:42:10 2006 +0000
     7.3 @@ -1,3 +1,11 @@
     7.4 +-------------------------------------------------------------------
     7.5 +Tue Aug 15 13:39:42 CEST 2006 - uwedr
     7.6 +
     7.7 +- Version: 1.8.52
     7.8 +- Feature: Changed format of configuration file a bit (new file anyway
     7.9 +  with introduction of QT4)
    7.10 +- Feature: Toolbar Layout is saved now
    7.11 +
    7.12  -------------------------------------------------------------------
    7.13  Thu Jul 27 14:28:54 CEST 2006 - uwedr
    7.14  
     8.1 --- a/texteditor.cpp	Tue Aug 01 09:31:22 2006 +0000
     8.2 +++ b/texteditor.cpp	Tue Aug 15 11:42:10 2006 +0000
     8.3 @@ -39,7 +39,7 @@
     8.4  TextEditor::TextEditor()
     8.5  {
     8.6      printer = new QPrinter( QPrinter::HighResolution );
     8.7 -	printer->setPrinterName (settings.readEntry("/vym/mainwindow/printerName",printer->printerName()));
     8.8 +	printer->setPrinterName (settings.value("/mainwindow/printerName",printer->printerName()).toString());
     8.9  
    8.10  	// Editor (use MyTextEdit to wrap verticalAlignmentChanged to 
    8.11  	//         int argument. see header file)
    8.12 @@ -64,25 +64,23 @@
    8.13  	setInactive();
    8.14  
    8.15  	// Load Settings
    8.16 -	resize (settings.readNumEntry( "/vym/noteeditor/geometry/width", 450),
    8.17 -	        settings.readNumEntry( "/vym/noteeditor/geometry/height",600));
    8.18 -	move   (settings.readNumEntry( "/vym/noteeditor/geometry/posX", 150),
    8.19 -	        settings.readNumEntry( "/vym/noteeditor/geometry/posY",  50));
    8.20 +	resize (settings.value ( "/noteeditor/geometry/size", QSize(450,600)).toSize());
    8.21 +	move   (settings.value ( "/noteeditor/geometry/pos", QPoint (250,50)).toPoint());
    8.22  	
    8.23 -	if (settings.readEntry( "/vym/noteeditor/showWithMain","yes") =="yes")
    8.24 +	if (settings.value ( "/noteeditor/showWithMain",true).toBool())
    8.25  		setShowWithMain(true);
    8.26  	else	
    8.27  		setShowWithMain(false);
    8.28  
    8.29 -	varFont.fromString( settings.readEntry 
    8.30 -		("/vym/noteeditor/fonts/varFont",
    8.31 -		"Nimbus Sans l,14,-1,5,48,0,0,0,0,0") 
    8.32 +	varFont.fromString( settings.value
    8.33 +		("/noteeditor/fonts/varFont",
    8.34 +		"Nimbus Sans l,14,-1,5,48,0,0,0,0,0").toString() 
    8.35  	);
    8.36 -	fixedFont.fromString (settings.readEntry (
    8.37 -		"/vym/noteeditor/fonts/fixedFont",
    8.38 -		"Courier,14,-1,5,48,0,0,0,1,0") 
    8.39 +	fixedFont.fromString (settings.value(
    8.40 +		"/noteeditor/fonts/fixedFont",
    8.41 +		"Courier,14,-1,5,48,0,0,0,1,0").toString() 
    8.42  	);
    8.43 -	QString s=settings.readEntry ("/vym/noteeditor/fonts/fonthintDefault","variable");
    8.44 +	QString s=settings.value ("/noteeditor/fonts/fonthintDefault","variable").toString();
    8.45  	if (s == "fixed")
    8.46  	{	
    8.47  		actionSettingsFonthintDefault->setOn (true);
    8.48 @@ -95,7 +93,7 @@
    8.49  	filenameHint="";
    8.50  
    8.51  	// Save settings in vymrc
    8.52 -	settings.writeEntry("/vym/mainwindow/printerName",printer->printerName());
    8.53 +	settings.setValue("/mainwindow/printerName",printer->printerName());
    8.54  }
    8.55  
    8.56  
    8.57 @@ -103,26 +101,19 @@
    8.58  {
    8.59      if (printer) delete printer;
    8.60  	// Save Settings
    8.61 -	settings.writeEntry( "/vym/noteeditor/geometry/width", width() );
    8.62 -	settings.writeEntry( "/vym/noteeditor/geometry/height", height() );
    8.63 -	settings.writeEntry( "/vym/noteeditor/geometry/posX", pos().x() );
    8.64 -	settings.writeEntry( "/vym/noteeditor/geometry/posY", pos().y() );
    8.65 +	settings.setValue( "/noteeditor/geometry/size", size() );
    8.66 +	settings.setValue( "/noteeditor/geometry/pos", pos() );
    8.67  	
    8.68 -	if (showWithMain())
    8.69 -		settings.writeEntry( "/vym/noteeditor/showWithMain","yes");
    8.70 -	else	
    8.71 -		settings.writeEntry( "/vym/noteeditor/showWithMain","no");
    8.72 +	settings.setValue( "/noteeditor/showWithMain",showWithMain());
    8.73  
    8.74  	QString s;
    8.75  	if (actionSettingsFonthintDefault->isOn() )
    8.76  		s="fixed";
    8.77  	else	
    8.78  		s="variable";
    8.79 -	settings.writeEntry( "/vym/noteeditor/fonts/fonthintDefault",s );
    8.80 -	settings.writeEntry ("/vym/noteeditor/fonts/varFont",
    8.81 -		varFont.toString() );
    8.82 -	settings.writeEntry ("/vym/noteeditor/fonts/fixedFont",
    8.83 -		fixedFont.toString() );
    8.84 +	settings.setValue( "/noteeditor/fonts/fonthintDefault",s );
    8.85 +	settings.setValue("/noteeditor/fonts/varFont", varFont.toString() );
    8.86 +	settings.setValue("/noteeditor/fonts/fixedFont", fixedFont.toString() );
    8.87  }
    8.88  
    8.89  bool TextEditor::isEmpty()
    8.90 @@ -208,8 +199,8 @@
    8.91  
    8.92  void TextEditor::setupFileActions()
    8.93  {
    8.94 -    QToolBar *tb = addToolBar ( tr("File Actions") );
    8.95 -    QMenu *fileMenu = menuBar()->addMenu( tr( "&File" ));
    8.96 +    QToolBar *tb = addToolBar ( tr("Note Actions") );
    8.97 +    QMenu *fileMenu = menuBar()->addMenu( tr( "&Note" ));
    8.98  
    8.99      QAction *a;
   8.100      a = new QAction( QPixmap( iconPath+"fileopen.png"), tr( "&Import..." ),this);
   8.101 @@ -342,7 +333,7 @@
   8.102      a = new QAction( QPixmap(iconPath+"formatfixedfont.png"), tr( "&Font hint" ), Qt::ALT + Qt::Key_I, this, "fontHint" );
   8.103  	a->setStatusTip (tr( "Toggle font hint for the whole text" ) );
   8.104  	a->setToggleAction (true);
   8.105 -	a->setOn (settings.readBoolEntry ("/vym/noteeditor/fonts/useFixedByDefault",false) );
   8.106 +	a->setOn (settings.value("/noteeditor/fonts/useFixedByDefault",false).toBool() );
   8.107      connect( a, SIGNAL( activated() ), this, SLOT( toggleFonthint() ) );
   8.108  	formatMenu->addAction (a);
   8.109  	tb->addAction (a);
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/toolbars.cpp	Tue Aug 15 11:42:10 2006 +0000
     9.3 @@ -0,0 +1,19 @@
     9.4 +#include "toolbars.h"
     9.5 +
     9.6 +ToolBarSet::ToolBarSet()
     9.7 +{
     9.8 +}
     9.9 +
    9.10 +void ToolBarSet::loadSettings(const Settings &s)
    9.11 +{
    9.12 +}
    9.13 +
    9.14 +void ToolBarSet::saveSettings(const Settings &s)
    9.15 +{
    9.16 +}
    9.17 +
    9.18 +void ToolBarSet::add(QToolBar *tb)
    9.19 +{
    9.20 +}
    9.21 +
    9.22 +
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/toolbars.h	Tue Aug 15 11:42:10 2006 +0000
    10.3 @@ -0,0 +1,31 @@
    10.4 +#ifndef TOOLBARS_H
    10.5 +#define TOOLBARS_H
    10.6 +
    10.7 +#include <QToolBar>
    10.8 +
    10.9 +#include "settings.h"
   10.10 +
   10.11 +class ToolBar:public QToolBar
   10.12 +{
   10.13 +	Q_OBJECT
   10.14 +
   10.15 +public:
   10.16 +	void loadSettings (const Settings &);
   10.17 +	void saveSettings (const Settings &);
   10.18 +
   10.19 +private:
   10.20 +};
   10.21 +
   10.22 +/////////////////////////////////////////////////////////////////////////////
   10.23 +class ToolBarSet
   10.24 +{
   10.25 +public:
   10.26 +	ToolBarSet();
   10.27 +	void loadSettings(const Settings &);	
   10.28 +	void saveSettings(const Settings &);	
   10.29 +	void add (QToolBar *);
   10.30 +private:
   10.31 +	QList <ToolBar*> list;
   10.32 +};
   10.33 +
   10.34 +#endif
    11.1 --- a/version.h	Tue Aug 01 09:31:22 2006 +0000
    11.2 +++ b/version.h	Tue Aug 15 11:42:10 2006 +0000
    11.3 @@ -2,7 +2,7 @@
    11.4  #define VERSION_H
    11.5  
    11.6  #define __VYM "VYM"
    11.7 -#define __VYM_VERSION "1.8.51"
    11.8 -#define __BUILD_DATE "July 27, 2006"
    11.9 +#define __VYM_VERSION "1.8.52"
   11.10 +#define __BUILD_DATE "August 15, 2006"
   11.11  
   11.12  #endif
    12.1 --- a/vym.pro	Tue Aug 01 09:31:22 2006 +0000
    12.2 +++ b/vym.pro	Tue Aug 15 11:42:10 2006 +0000
    12.3 @@ -2,6 +2,7 @@
    12.4  LANGUAGE	= C++
    12.5  
    12.6  CONFIG	+= qt warn_on release
    12.7 +QT += qt3support
    12.8  
    12.9  HEADERS	+= aboutdialog.h \
   12.10  	api.h \
   12.11 @@ -30,6 +31,7 @@
   12.12  	process.h \
   12.13  	selection.h \
   12.14  	texteditor.h \
   12.15 +	toolbars.h \
   12.16  	version.h \
   12.17  	xml.h \
   12.18  	xsltproc.h \
   12.19 @@ -64,17 +66,24 @@
   12.20  	process.cpp \
   12.21  	selection.cpp \
   12.22  	texteditor.cpp \
   12.23 +	toolbars.cpp \
   12.24  	xml.cpp \
   12.25  	xsltproc.cpp \
   12.26  	settings.cpp \
   12.27  	options.cpp
   12.28  
   12.29 -FORMS	= exportxhtmldialog.ui \
   12.30 +#The following line was inserted by qt3to4, use "FORMS" later
   12.31 +FORMS3	= exportxhtmldialog.ui \
   12.32  	showtextdialog.ui \
   12.33  	extrainfodialog.ui \
   12.34  	editxlinkdialog.ui \
   12.35  	warningdialog.ui
   12.36  
   12.37 +#The following line was inserted by qt3to4
   12.38 +QT += xml  
   12.39 +#The following line was inserted by qt3to4
   12.40 +CONFIG += uic3
   12.41 +
   12.42  TARGET  = vym
   12.43  TRANSLATIONS += lang/vym_de.ts
   12.44  TRANSLATIONS += lang/vym_en.ts
   12.45 @@ -82,15 +91,15 @@
   12.46  TRANSLATIONS += lang/vym_it.ts
   12.47  
   12.48  count( INSTALLDIR, 0 ) {
   12.49 -	INSTALLDIR = /usr/local/bin
   12.50 +	INSTALLDIR = /usr/local
   12.51  }
   12.52  
   12.53  message( "Installation directory" )
   12.54  message( $$INSTALLDIR )
   12.55  
   12.56  
   12.57 -target.path = $$INSTALLDIR
   12.58 -INSTALLS += target
   12.59 +#target.path = $$INSTALLDIR
   12.60 +#INSTALLS += target
   12.61  
   12.62  
   12.63  target.path = $${INSTALLDIR}/bin