# HG changeset patch
# User insilmaril
# Date 1124202343 0
# Node ID 4b2e70fbacec5b590196e9f3b9373b0514d9c52e
# Parent 85eab6b8120bae58aab3652506758fd8f4e54481
a few minor bugs fixed
diff -r 85eab6b8120b -r 4b2e70fbacec branchobj.cpp
--- a/branchobj.cpp Wed Aug 10 06:26:20 2005 +0000
+++ b/branchobj.cpp Tue Aug 16 14:25:43 2005 +0000
@@ -1115,6 +1115,7 @@
{
// links myself as last branch at dst
dst->addBranchPtr (this);
+ updateLink();
return this;
} else
{
@@ -1123,6 +1124,7 @@
{
BranchObj *bo=dst->insertBranchPtr (this,pos);
bo->setDefAttr(MovedBranch);
+ updateLink();
return bo;
} else
diff -r 85eab6b8120b -r 4b2e70fbacec demos/todo.vym
Binary file demos/todo.vym has changed
diff -r 85eab6b8120b -r 4b2e70fbacec mainwindow.cpp
--- a/mainwindow.cpp Wed Aug 10 06:26:20 2005 +0000
+++ b/mainwindow.cpp Tue Aug 16 14:25:43 2005 +0000
@@ -340,7 +340,7 @@
menu->insertSeparator();
- a = new QAction( tr( "Import directory structure (experimental)" ), QPixmap(), tr( "Import Dir" ), 0, this, "export" );
+ a = new QAction( tr( "Import directory structure (experimental)" ), QPixmap(), tr( "Import Dir"+QString("...") ), 0, this, "export" );
connect( a, SIGNAL( activated() ), this, SLOT( fileImportDir() ) );
a->addTo( menu );
@@ -445,7 +445,7 @@
menu->insertSeparator();
- a = new QAction( tr( "Find" ), QPixmap(), tr( "Find" ), CTRL + Key_F, this, "find" );
+ a = new QAction( tr( "Find" ), QPixmap(), tr( "Find"+QString("...") ), CTRL + Key_F, this, "find" );
connect( a, SIGNAL( activated() ), this, SLOT( editOpenFindWindow() ) );
a->addTo( menu );
@@ -458,7 +458,7 @@
a->setEnabled (false);
actionEditOpenURL=a;
- a = new QAction( tr( "Edit URL" ), QPixmap(), tr( "Edit URL" ), SHIFT + CTRL + Key_U, this, "url" );
+ a = new QAction( tr( "Edit URL" ), QPixmap(), tr( "Edit URL"+QString("...") ), SHIFT + CTRL + Key_U, this, "url" );
connect( a, SIGNAL( activated() ), this, SLOT( editURL() ) );
a->addTo( menu );
a->setEnabled (false);
@@ -487,7 +487,7 @@
a->setEnabled (false);
actionEditOpenVymLink=a;
- a = new QAction( tr( "Edit link to another vym map" ), QPixmap(), tr( "Edit vym link" ), 0, this, "editLinkMap" );
+ a = new QAction( tr( "Edit link to another vym map" ), QPixmap(), tr( "Edit vym link"+QString("...") ), 0, this, "editLinkMap" );
connect( a, SIGNAL( activated() ), this, SLOT( editVymLink() ) );
a->addTo( menu );
a->setEnabled (false);
@@ -502,7 +502,7 @@
menu->insertSeparator();
- a = new QAction( tr( "Edit Map Info" ), QPixmap(), tr( "Edit Map Info" ), 0, this, "editMapInfo" );
+ a = new QAction( tr( "Edit Map Info" ), QPixmap(), tr( "Edit Map Info"+QString("...") ), 0, this, "editMapInfo" );
connect( a, SIGNAL( activated() ), this, SLOT( editMapInfo() ) );
a->addTo( menu );
a->setEnabled (true);
@@ -623,7 +623,7 @@
actionListBranches.append(a);
actionEditSelectLast=a;
- a = new QAction( tr( "Add Image" ),tr( "Add Image" ), 0, this, "loadImage" );
+ a = new QAction( tr( "Add Image" ),tr( "Add Image" )+QString("..."), 0, this, "loadImage" );
connect( a, SIGNAL( activated() ), this, SLOT( editLoadImage() ) );
actionEditLoadImage=a;
@@ -639,7 +639,7 @@
QAction *a;
QPixmap pix( 16,16);
pix.fill (black);
- actionFormatColor= new QAction( tr( "Set Color" ), pix, tr( "Set &Color" ), 0, this, "formatColor" );
+ actionFormatColor= new QAction( tr( "Set Color" ), pix, tr( "Set &Color" )+QString("..."), 0, this, "formatColor" );
connect( actionFormatColor, SIGNAL( activated() ), this, SLOT( formatSelectColor() ) );
actionFormatColor->addTo( tb );
actionFormatColor->addTo( menu );
@@ -704,10 +704,10 @@
a->addTo( menu );
actionFormatLinkColorHint=a;
pix.fill (white);
- actionFormatLinkColor= new QAction( tr( "Set Link Color" ), pix, tr( "Set &Link Color" ), 0, this, "formatLinkColor" );
+ actionFormatLinkColor= new QAction( tr( "Set Link Color" ), pix, tr( "Set &Link Color"+QString("...") ), 0, this, "formatLinkColor" );
connect( actionFormatLinkColor, SIGNAL( activated() ), this, SLOT( formatSelectLinkColor() ) );
actionFormatLinkColor->addTo( menu );
- actionFormatBackColor= new QAction( tr( "Set Background Color" ), pix, tr( "Set &Background Color" ), 0, this, "formatBackColor" );
+ actionFormatBackColor= new QAction( tr( "Set Background Color" ), pix, tr( "Set &Background Color" )+QString("..."), 0, this, "formatBackColor" );
connect( actionFormatBackColor, SIGNAL( activated() ), this, SLOT( formatSelectBackColor() ) );
actionFormatBackColor->addTo( menu );
}
@@ -721,7 +721,7 @@
menuBar()->insertItem( tr( "&View" ), menu );
QAction *a;
- a = new QAction( tr( "Zoom reset" ), QPixmap(viewzoomreset_xpm), tr( "reset Zoom" ), 0, this, "zoomReset" );
+ a = new QAction( tr( "Zoom reset" ), QPixmap(viewzoomreset_xpm), tr( "reset Zoom" ), CTRL + Key_0, this, "zoomReset" );
connect( a, SIGNAL( activated() ), this, SLOT(viewZoomReset() ) );
a->addTo( tb );
a->addTo( menu );
@@ -794,11 +794,11 @@
QAction *a;
- a = new QAction( tr( "Set application to open pdf files" ), QPixmap(), tr( "Set application to open pdf files" ), 0, this, "setPDF" );
+ a = new QAction( tr( "Set application to open pdf files"), QPixmap(), tr( "Set application to open pdf files")+QString("...") , 0, this, "setPDF" );
connect( a, SIGNAL( activated() ), this, SLOT( settingsPDF() ) );
a->addTo( menu );
- a = new QAction( tr( "Set application to open an URL" ), QPixmap(), tr( "Set application to open an URL" ), 0, this, "setURL" );
+ a = new QAction( tr( "Set application to open external links"), QPixmap(), tr( "Set application to open external links")+QString("..."), 0, this, "setURL" );
connect( a, SIGNAL( activated() ), this, SLOT( settingsURL() ) );
a->addTo( menu );
@@ -821,19 +821,19 @@
a->addTo( menu );
actionSettingsAutoselectText=a;
- a= new QAction( tr( "Enable pasting into new branch" ), QPixmap(), tr( "Enable pasting into new branch" ), 0, this, "pastenewheading" );
+ a= new QAction( tr( "Pasting into new branch" ), QPixmap(), tr( "pasting into new branch" ), 0, this, "pastenewheading" );
a->setToggleAction(true);
a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/newheadingisempty",true) );
a->addTo( menu );
actionSettingsPasteNewHeading=a;
- a= new QAction( tr( "Enable Delete key for deleting branches" ), QPixmap(), tr( "Enable Delete key" ), 0, this, "delkey" );
+ a= new QAction( tr( "Delete key for deleting branches" ), QPixmap(), tr( "Delete key" ), 0, this, "delkey" );
a->setToggleAction(true);
a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useDelKey",false) );
a->addTo( menu );
actionSettingsUseDelKey=a;
- a= new QAction( tr( "Use exclusive flags in flag toolbars" ), QPixmap(), tr( "Enable exclusive flags" ), 0, this, "flaggroups" );
+ a= new QAction( tr( "Use exclusive flags in flag toolbars" ), QPixmap(), tr( "Exclusive flags" ), 0, this, "flaggroups" );
a->setToggleAction(true);
a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useFlagGroups",true) );
a->addTo( menu );
@@ -966,22 +966,22 @@
// Context menu for exports
exportMenu->insertItem ( tr("Export map as image"),exportImageFormatMenu);
- a = new QAction( tr( "Export as ASCII (still experimental)" ), QPixmap(), tr( "Export (ASCII)" ), 0, this, "exportASCII" );
+ a = new QAction( tr( "Export as ASCII (still experimental)" ), QPixmap(), tr( "Export (ASCII)" +QString("...")), 0, this, "exportASCII" );
connect( a, SIGNAL( activated() ), this, SLOT( fileExportASCII() ) );
a->addTo( exportMenu );
- a = new QAction( tr( "Export XML" ), QPixmap(), tr( "Export XML" ), 0, this, "exportXML" );
+ a = new QAction( tr( "Export XML" ), QPixmap(), tr( "Export XML" ), 0, this, "exportXML"+QString("...") );
connect( a, SIGNAL( activated() ), this, SLOT( fileExportXML() ) );
a->addTo( exportMenu );
if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false))
{
- a = new QAction( tr( "Export HTML" ), QPixmap(), tr( "Export HTML" ), 0, this, "exportHTML" );
+ a = new QAction( tr( "Export HTML" ), QPixmap(), tr( "Export HTML" ), 0, this, "exportHTML"+QString("...") );
connect( a, SIGNAL( activated() ), this, SLOT( fileExportHTML() ) );
a->addTo( exportMenu );
}
- a = new QAction( tr( "Export XHTML" ), QPixmap(), tr( "Export XHTML" ), ALT + Key_X, this, "exportXHTML" );
+ a = new QAction( tr( "Export XHTML" ), QPixmap(), tr( "Export XHTML" )+QString("..."), ALT + Key_X, this, "exportXHTML" );
connect( a, SIGNAL( activated() ), this, SLOT( fileExportXHTML() ) );
a->addTo( exportMenu );
@@ -1426,9 +1426,10 @@
bool saveZipped=currentMapEditor()->saveZipped();
- if (currentMapEditor())
+ MapEditor * me=currentMapEditor();
+ if (me)
{
- QString fn=currentMapEditor()->getFilePath();
+ QString fn=me->getFilePath();
// filename=unnamed, filepath="" in constructor...
if ( !fn.isEmpty() )
{
@@ -1479,12 +1480,12 @@
char tmpdir1[]="/tmp/vym-XXXXXX";
tmpMapDir=mkdtemp(tmpdir1);
- safeFilePath=currentMapEditor()->getFilePath();
- currentMapEditor()->setFilePath (tmpMapDir+"/"+
- currentMapEditor()->getMapName()+ ".xml",
+ safeFilePath=me->getFilePath();
+ me->setFilePath (tmpMapDir+"/"+
+ me->getMapName()+ ".xml",
safeFilePath);
- currentMapEditor()->save (savemode);
- currentMapEditor()->setFilePath (safeFilePath);
+ me->save (savemode);
+ me->setFilePath (safeFilePath);
// zip the temporary directory
Process *zipProc=new Process ();
@@ -1526,10 +1527,10 @@
else
{
// Save unzipped.
- safeFilePath=currentMapEditor()->getFilePath();
- currentMapEditor()->setFilePath (fn, safeFilePath);
- currentMapEditor()->save (savemode);
- currentMapEditor()->setFilePath (safeFilePath);
+ safeFilePath=me->getFilePath();
+ me->setFilePath (fn, safeFilePath);
+ me->save (savemode);
+ me->setFilePath (safeFilePath);
} // save zipped
} // filepath available
else
@@ -1541,19 +1542,22 @@
}
}
- if (currentMapEditor()->saveZipped())
+ if (me->saveZipped())
{
// Delete tmpDir
system ( "rm -rf "+ tmpMapDir );
}
if (err==success)
+ {
statusBar()->message(
- tr("Saved")+" " + currentMapEditor()->getFilePath(),
+ tr("Saved")+" " + me->getFilePath(),
statusbarTime );
- else
+ lastMaps.prepend(me->getFilePath() );
+ setupLastMapsMenu();
+ } else
statusBar()->message(
- tr("Couldn't save")+" " + currentMapEditor()->getFilePath(),
+ tr("Couldn't save")+" " + me->getFilePath(),
statusbarTime );
}
@@ -2036,7 +2040,7 @@
void Main::editDeleteSelection()
{
- if (currentMapEditor())
+ if (currentMapEditor() && actionSettingsUseDelKey->isOn())
currentMapEditor()->deleteSelection();
}
diff -r 85eab6b8120b -r 4b2e70fbacec tex/vym.changelog
--- a/tex/vym.changelog Wed Aug 10 06:26:20 2005 +0000
+++ b/tex/vym.changelog Tue Aug 16 14:25:43 2005 +0000
@@ -1,5 +1,13 @@
-------------------------------------------------------------------
-Tue Aug 2 09:59:24 CEST 2005 - uwedr
+Tue Aug 16 12:25:09 CEST 2005 - uwe
+
+- Feature: Added keyboard shortcut to reset zoom factor
+- Bugfix: Added "..." to menu entries leading to another dialog
+- Bugfix: The setting option "Delete Key" is working again
+- Bugfix: A branch moved from left side to right had wrong orienation
+
+-------------------------------------------------------------------
+Tue Aug 2 09:59:24 CEST 2005 - uwe
- Bugfix: Heading sizes now correct after moving e.g. mainbranch to
a branch
diff -r 85eab6b8120b -r 4b2e70fbacec version.h
--- a/version.h Wed Aug 10 06:26:20 2005 +0000
+++ b/version.h Tue Aug 16 14:25:43 2005 +0000
@@ -2,6 +2,6 @@
#define VERSION_H
#define __VYM_VERSION__ "1.7.3"
-#define __BUILD_DATE__ "August 8, 2005"
+#define __BUILD_DATE__ "August 16, 2005"
#endif