1.1 --- a/branchobj.cpp Wed Aug 10 06:26:20 2005 +0000
1.2 +++ b/branchobj.cpp Tue Aug 16 14:25:43 2005 +0000
1.3 @@ -1115,6 +1115,7 @@
1.4 {
1.5 // links myself as last branch at dst
1.6 dst->addBranchPtr (this);
1.7 + updateLink();
1.8 return this;
1.9 } else
1.10 {
1.11 @@ -1123,6 +1124,7 @@
1.12 {
1.13 BranchObj *bo=dst->insertBranchPtr (this,pos);
1.14 bo->setDefAttr(MovedBranch);
1.15 + updateLink();
1.16 return bo;
1.17
1.18 } else
2.1 Binary file demos/todo.vym has changed
3.1 --- a/mainwindow.cpp Wed Aug 10 06:26:20 2005 +0000
3.2 +++ b/mainwindow.cpp Tue Aug 16 14:25:43 2005 +0000
3.3 @@ -340,7 +340,7 @@
3.4
3.5 menu->insertSeparator();
3.6
3.7 - a = new QAction( tr( "Import directory structure (experimental)" ), QPixmap(), tr( "Import Dir" ), 0, this, "export" );
3.8 + a = new QAction( tr( "Import directory structure (experimental)" ), QPixmap(), tr( "Import Dir"+QString("...") ), 0, this, "export" );
3.9 connect( a, SIGNAL( activated() ), this, SLOT( fileImportDir() ) );
3.10 a->addTo( menu );
3.11
3.12 @@ -445,7 +445,7 @@
3.13
3.14 menu->insertSeparator();
3.15
3.16 - a = new QAction( tr( "Find" ), QPixmap(), tr( "Find" ), CTRL + Key_F, this, "find" );
3.17 + a = new QAction( tr( "Find" ), QPixmap(), tr( "Find"+QString("...") ), CTRL + Key_F, this, "find" );
3.18 connect( a, SIGNAL( activated() ), this, SLOT( editOpenFindWindow() ) );
3.19 a->addTo( menu );
3.20
3.21 @@ -458,7 +458,7 @@
3.22 a->setEnabled (false);
3.23 actionEditOpenURL=a;
3.24
3.25 - a = new QAction( tr( "Edit URL" ), QPixmap(), tr( "Edit URL" ), SHIFT + CTRL + Key_U, this, "url" );
3.26 + a = new QAction( tr( "Edit URL" ), QPixmap(), tr( "Edit URL"+QString("...") ), SHIFT + CTRL + Key_U, this, "url" );
3.27 connect( a, SIGNAL( activated() ), this, SLOT( editURL() ) );
3.28 a->addTo( menu );
3.29 a->setEnabled (false);
3.30 @@ -487,7 +487,7 @@
3.31 a->setEnabled (false);
3.32 actionEditOpenVymLink=a;
3.33
3.34 - a = new QAction( tr( "Edit link to another vym map" ), QPixmap(), tr( "Edit vym link" ), 0, this, "editLinkMap" );
3.35 + a = new QAction( tr( "Edit link to another vym map" ), QPixmap(), tr( "Edit vym link"+QString("...") ), 0, this, "editLinkMap" );
3.36 connect( a, SIGNAL( activated() ), this, SLOT( editVymLink() ) );
3.37 a->addTo( menu );
3.38 a->setEnabled (false);
3.39 @@ -502,7 +502,7 @@
3.40
3.41 menu->insertSeparator();
3.42
3.43 - a = new QAction( tr( "Edit Map Info" ), QPixmap(), tr( "Edit Map Info" ), 0, this, "editMapInfo" );
3.44 + a = new QAction( tr( "Edit Map Info" ), QPixmap(), tr( "Edit Map Info"+QString("...") ), 0, this, "editMapInfo" );
3.45 connect( a, SIGNAL( activated() ), this, SLOT( editMapInfo() ) );
3.46 a->addTo( menu );
3.47 a->setEnabled (true);
3.48 @@ -623,7 +623,7 @@
3.49 actionListBranches.append(a);
3.50 actionEditSelectLast=a;
3.51
3.52 - a = new QAction( tr( "Add Image" ),tr( "Add Image" ), 0, this, "loadImage" );
3.53 + a = new QAction( tr( "Add Image" ),tr( "Add Image" )+QString("..."), 0, this, "loadImage" );
3.54 connect( a, SIGNAL( activated() ), this, SLOT( editLoadImage() ) );
3.55 actionEditLoadImage=a;
3.56
3.57 @@ -639,7 +639,7 @@
3.58 QAction *a;
3.59 QPixmap pix( 16,16);
3.60 pix.fill (black);
3.61 - actionFormatColor= new QAction( tr( "Set Color" ), pix, tr( "Set &Color" ), 0, this, "formatColor" );
3.62 + actionFormatColor= new QAction( tr( "Set Color" ), pix, tr( "Set &Color" )+QString("..."), 0, this, "formatColor" );
3.63 connect( actionFormatColor, SIGNAL( activated() ), this, SLOT( formatSelectColor() ) );
3.64 actionFormatColor->addTo( tb );
3.65 actionFormatColor->addTo( menu );
3.66 @@ -704,10 +704,10 @@
3.67 a->addTo( menu );
3.68 actionFormatLinkColorHint=a;
3.69 pix.fill (white);
3.70 - actionFormatLinkColor= new QAction( tr( "Set Link Color" ), pix, tr( "Set &Link Color" ), 0, this, "formatLinkColor" );
3.71 + actionFormatLinkColor= new QAction( tr( "Set Link Color" ), pix, tr( "Set &Link Color"+QString("...") ), 0, this, "formatLinkColor" );
3.72 connect( actionFormatLinkColor, SIGNAL( activated() ), this, SLOT( formatSelectLinkColor() ) );
3.73 actionFormatLinkColor->addTo( menu );
3.74 - actionFormatBackColor= new QAction( tr( "Set Background Color" ), pix, tr( "Set &Background Color" ), 0, this, "formatBackColor" );
3.75 + actionFormatBackColor= new QAction( tr( "Set Background Color" ), pix, tr( "Set &Background Color" )+QString("..."), 0, this, "formatBackColor" );
3.76 connect( actionFormatBackColor, SIGNAL( activated() ), this, SLOT( formatSelectBackColor() ) );
3.77 actionFormatBackColor->addTo( menu );
3.78 }
3.79 @@ -721,7 +721,7 @@
3.80 menuBar()->insertItem( tr( "&View" ), menu );
3.81
3.82 QAction *a;
3.83 - a = new QAction( tr( "Zoom reset" ), QPixmap(viewzoomreset_xpm), tr( "reset Zoom" ), 0, this, "zoomReset" );
3.84 + a = new QAction( tr( "Zoom reset" ), QPixmap(viewzoomreset_xpm), tr( "reset Zoom" ), CTRL + Key_0, this, "zoomReset" );
3.85 connect( a, SIGNAL( activated() ), this, SLOT(viewZoomReset() ) );
3.86 a->addTo( tb );
3.87 a->addTo( menu );
3.88 @@ -794,11 +794,11 @@
3.89 QAction *a;
3.90
3.91
3.92 - a = new QAction( tr( "Set application to open pdf files" ), QPixmap(), tr( "Set application to open pdf files" ), 0, this, "setPDF" );
3.93 + a = new QAction( tr( "Set application to open pdf files"), QPixmap(), tr( "Set application to open pdf files")+QString("...") , 0, this, "setPDF" );
3.94 connect( a, SIGNAL( activated() ), this, SLOT( settingsPDF() ) );
3.95 a->addTo( menu );
3.96
3.97 - a = new QAction( tr( "Set application to open an URL" ), QPixmap(), tr( "Set application to open an URL" ), 0, this, "setURL" );
3.98 + a = new QAction( tr( "Set application to open external links"), QPixmap(), tr( "Set application to open external links")+QString("..."), 0, this, "setURL" );
3.99 connect( a, SIGNAL( activated() ), this, SLOT( settingsURL() ) );
3.100 a->addTo( menu );
3.101
3.102 @@ -821,19 +821,19 @@
3.103 a->addTo( menu );
3.104 actionSettingsAutoselectText=a;
3.105
3.106 - a= new QAction( tr( "Enable pasting into new branch" ), QPixmap(), tr( "Enable pasting into new branch" ), 0, this, "pastenewheading" );
3.107 + a= new QAction( tr( "Pasting into new branch" ), QPixmap(), tr( "pasting into new branch" ), 0, this, "pastenewheading" );
3.108 a->setToggleAction(true);
3.109 a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/newheadingisempty",true) );
3.110 a->addTo( menu );
3.111 actionSettingsPasteNewHeading=a;
3.112
3.113 - a= new QAction( tr( "Enable Delete key for deleting branches" ), QPixmap(), tr( "Enable Delete key" ), 0, this, "delkey" );
3.114 + a= new QAction( tr( "Delete key for deleting branches" ), QPixmap(), tr( "Delete key" ), 0, this, "delkey" );
3.115 a->setToggleAction(true);
3.116 a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useDelKey",false) );
3.117 a->addTo( menu );
3.118 actionSettingsUseDelKey=a;
3.119
3.120 - a= new QAction( tr( "Use exclusive flags in flag toolbars" ), QPixmap(), tr( "Enable exclusive flags" ), 0, this, "flaggroups" );
3.121 + a= new QAction( tr( "Use exclusive flags in flag toolbars" ), QPixmap(), tr( "Exclusive flags" ), 0, this, "flaggroups" );
3.122 a->setToggleAction(true);
3.123 a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useFlagGroups",true) );
3.124 a->addTo( menu );
3.125 @@ -966,22 +966,22 @@
3.126 // Context menu for exports
3.127 exportMenu->insertItem ( tr("Export map as image"),exportImageFormatMenu);
3.128
3.129 - a = new QAction( tr( "Export as ASCII (still experimental)" ), QPixmap(), tr( "Export (ASCII)" ), 0, this, "exportASCII" );
3.130 + a = new QAction( tr( "Export as ASCII (still experimental)" ), QPixmap(), tr( "Export (ASCII)" +QString("...")), 0, this, "exportASCII" );
3.131 connect( a, SIGNAL( activated() ), this, SLOT( fileExportASCII() ) );
3.132 a->addTo( exportMenu );
3.133
3.134 - a = new QAction( tr( "Export XML" ), QPixmap(), tr( "Export XML" ), 0, this, "exportXML" );
3.135 + a = new QAction( tr( "Export XML" ), QPixmap(), tr( "Export XML" ), 0, this, "exportXML"+QString("...") );
3.136 connect( a, SIGNAL( activated() ), this, SLOT( fileExportXML() ) );
3.137 a->addTo( exportMenu );
3.138
3.139 if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false))
3.140 {
3.141 - a = new QAction( tr( "Export HTML" ), QPixmap(), tr( "Export HTML" ), 0, this, "exportHTML" );
3.142 + a = new QAction( tr( "Export HTML" ), QPixmap(), tr( "Export HTML" ), 0, this, "exportHTML"+QString("...") );
3.143 connect( a, SIGNAL( activated() ), this, SLOT( fileExportHTML() ) );
3.144 a->addTo( exportMenu );
3.145 }
3.146
3.147 - a = new QAction( tr( "Export XHTML" ), QPixmap(), tr( "Export XHTML" ), ALT + Key_X, this, "exportXHTML" );
3.148 + a = new QAction( tr( "Export XHTML" ), QPixmap(), tr( "Export XHTML" )+QString("..."), ALT + Key_X, this, "exportXHTML" );
3.149 connect( a, SIGNAL( activated() ), this, SLOT( fileExportXHTML() ) );
3.150 a->addTo( exportMenu );
3.151
3.152 @@ -1426,9 +1426,10 @@
3.153
3.154 bool saveZipped=currentMapEditor()->saveZipped();
3.155
3.156 - if (currentMapEditor())
3.157 + MapEditor * me=currentMapEditor();
3.158 + if (me)
3.159 {
3.160 - QString fn=currentMapEditor()->getFilePath();
3.161 + QString fn=me->getFilePath();
3.162 // filename=unnamed, filepath="" in constructor...
3.163 if ( !fn.isEmpty() )
3.164 {
3.165 @@ -1479,12 +1480,12 @@
3.166 char tmpdir1[]="/tmp/vym-XXXXXX";
3.167 tmpMapDir=mkdtemp(tmpdir1);
3.168
3.169 - safeFilePath=currentMapEditor()->getFilePath();
3.170 - currentMapEditor()->setFilePath (tmpMapDir+"/"+
3.171 - currentMapEditor()->getMapName()+ ".xml",
3.172 + safeFilePath=me->getFilePath();
3.173 + me->setFilePath (tmpMapDir+"/"+
3.174 + me->getMapName()+ ".xml",
3.175 safeFilePath);
3.176 - currentMapEditor()->save (savemode);
3.177 - currentMapEditor()->setFilePath (safeFilePath);
3.178 + me->save (savemode);
3.179 + me->setFilePath (safeFilePath);
3.180
3.181 // zip the temporary directory
3.182 Process *zipProc=new Process ();
3.183 @@ -1526,10 +1527,10 @@
3.184 else
3.185 {
3.186 // Save unzipped.
3.187 - safeFilePath=currentMapEditor()->getFilePath();
3.188 - currentMapEditor()->setFilePath (fn, safeFilePath);
3.189 - currentMapEditor()->save (savemode);
3.190 - currentMapEditor()->setFilePath (safeFilePath);
3.191 + safeFilePath=me->getFilePath();
3.192 + me->setFilePath (fn, safeFilePath);
3.193 + me->save (savemode);
3.194 + me->setFilePath (safeFilePath);
3.195 } // save zipped
3.196 } // filepath available
3.197 else
3.198 @@ -1541,19 +1542,22 @@
3.199 }
3.200 }
3.201
3.202 - if (currentMapEditor()->saveZipped())
3.203 + if (me->saveZipped())
3.204 {
3.205 // Delete tmpDir
3.206 system ( "rm -rf "+ tmpMapDir );
3.207 }
3.208
3.209 if (err==success)
3.210 + {
3.211 statusBar()->message(
3.212 - tr("Saved")+" " + currentMapEditor()->getFilePath(),
3.213 + tr("Saved")+" " + me->getFilePath(),
3.214 statusbarTime );
3.215 - else
3.216 + lastMaps.prepend(me->getFilePath() );
3.217 + setupLastMapsMenu();
3.218 + } else
3.219 statusBar()->message(
3.220 - tr("Couldn't save")+" " + currentMapEditor()->getFilePath(),
3.221 + tr("Couldn't save")+" " + me->getFilePath(),
3.222 statusbarTime );
3.223 }
3.224
3.225 @@ -2036,7 +2040,7 @@
3.226
3.227 void Main::editDeleteSelection()
3.228 {
3.229 - if (currentMapEditor())
3.230 + if (currentMapEditor() && actionSettingsUseDelKey->isOn())
3.231 currentMapEditor()->deleteSelection();
3.232 }
3.233
4.1 --- a/tex/vym.changelog Wed Aug 10 06:26:20 2005 +0000
4.2 +++ b/tex/vym.changelog Tue Aug 16 14:25:43 2005 +0000
4.3 @@ -1,5 +1,13 @@
4.4 -------------------------------------------------------------------
4.5 -Tue Aug 2 09:59:24 CEST 2005 - uwedr
4.6 +Tue Aug 16 12:25:09 CEST 2005 - uwe
4.7 +
4.8 +- Feature: Added keyboard shortcut to reset zoom factor
4.9 +- Bugfix: Added "..." to menu entries leading to another dialog
4.10 +- Bugfix: The setting option "Delete Key" is working again
4.11 +- Bugfix: A branch moved from left side to right had wrong orienation
4.12 +
4.13 +-------------------------------------------------------------------
4.14 +Tue Aug 2 09:59:24 CEST 2005 - uwe
4.15
4.16 - Bugfix: Heading sizes now correct after moving e.g. mainbranch to
4.17 a branch
5.1 --- a/version.h Wed Aug 10 06:26:20 2005 +0000
5.2 +++ b/version.h Tue Aug 16 14:25:43 2005 +0000
5.3 @@ -2,6 +2,6 @@
5.4 #define VERSION_H
5.5
5.6 #define __VYM_VERSION__ "1.7.3"
5.7 -#define __BUILD_DATE__ "August 8, 2005"
5.8 +#define __BUILD_DATE__ "August 16, 2005"
5.9
5.10 #endif