# HG changeset patch
# User insilmaril
# Date 1196771579 0
# Node ID d7d0708b1c606f07095c0f041080da35264d43f7
# Parent  513107d1ed59061329348b9a694cba899557444d
Fixed HideExport bug, changed pre- and postscript in XHTML export dialog

diff -r 513107d1ed59 -r d7d0708b1c60 attributewidget.ui
--- a/attributewidget.ui	Tue Dec 04 12:32:56 2007 +0000
+++ b/attributewidget.ui	Tue Dec 04 12:32:59 2007 +0000
@@ -17,6 +17,13 @@
     <number>0</number>
    </property>
    <item>
+    <widget class="QPushButton" name="pushButton" >
+     <property name="text" >
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QComboBox" name="keyComboBox" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
diff -r 513107d1ed59 -r d7d0708b1c60 branchobj.cpp
--- a/branchobj.cpp	Tue Dec 04 12:32:56 2007 +0000
+++ b/branchobj.cpp	Tue Dec 04 12:32:59 2007 +0000
@@ -740,12 +740,14 @@
 
 void BranchObj::setHideTmp (HideTmpMode mode)
 {
-	if (mode==HideExport && hasHiddenExportParent())
+	if (mode==HideExport && (hideExport|| hasHiddenExportParent() ) )
 	{
+		// Hide stuff according to hideExport flag and parents
 		setVisibility (false);
 		hidden=true;
 	}else
 	{
+		// Do not hide, but still take care of scrolled status
 		if (hasScrolledParent(this))
 			setVisibility (false);
 		else
@@ -753,6 +755,7 @@
 		hidden=false;
 	}	
 
+	// And take care of my childs
 	for (int i=0; i<branch.size(); ++i)
 		branch.at(i)->setHideTmp (mode);
 }
@@ -760,9 +763,9 @@
 bool BranchObj::hasHiddenExportParent()
 {
 	// Calls parents recursivly to
-	// find out, if we are temp. hidden
+	// find out, if we or parents are temp. hidden
 
-	if (hideExport) return true;
+	if (hidden || hideExport) return true;
 
 	BranchObj* bo=(BranchObj*)parObj;
 	if (bo) 
@@ -807,7 +810,7 @@
 		idAttr="";
 
     s=beginElement ("branch" 
-		+getOrnAttr() 
+		+getOrnXMLAttr() 
 		+scrolledAttr 
 		+areaAttr 
 		+idAttr 
diff -r 513107d1ed59 -r d7d0708b1c60 branchobj.h
--- a/branchobj.h	Tue Dec 04 12:32:56 2007 +0000
+++ b/branchobj.h	Tue Dec 04 12:32:59 2007 +0000
@@ -11,14 +11,16 @@
 
 /*! \brief A branch visible in the map */
 
+/*! If HideExport is used, this branch and its childs will be hidden in export */
+enum HideTmpMode {HideNone, HideExport};
+
+
 /////////////////////////////////////////////////////////////////////////////
 class BranchObj:public OrnamentedObj {
 public:
 	/*! New branches will get use same color for heading as parent */
 	enum BranchModification {NewBranch, MovedBranch};
 
-	/*! If HideExport is used, this branch and its childs will be hidden in export */
-	enum HideTmpMode {HideNone, HideExport};
 
     BranchObj ();
     BranchObj (QGraphicsScene*);
diff -r 513107d1ed59 -r d7d0708b1c60 demos/vym-projectplan.vym
Binary file demos/vym-projectplan.vym has changed
diff -r 513107d1ed59 -r d7d0708b1c60 exportxhtmldialog.ui
--- a/exportxhtmldialog.ui	Tue Dec 04 12:32:56 2007 +0000
+++ b/exportxhtmldialog.ui	Tue Dec 04 12:32:59 2007 +0000
@@ -381,7 +381,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QLineEdit" name="lineEditPostScript" />
+         <widget class="QLineEdit" name="lineEditPreScript" />
         </item>
         <item>
          <widget class="QPushButton" name="browsePreExportButton" >
@@ -441,7 +441,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QLineEdit" name="lineEditPreScript" />
+         <widget class="QLineEdit" name="lineEditPostScript" />
         </item>
         <item>
          <widget class="QPushButton" name="browsePostExportButton" >
diff -r 513107d1ed59 -r d7d0708b1c60 floatimageobj.cpp
--- a/floatimageobj.cpp	Tue Dec 04 12:32:56 2007 +0000
+++ b/floatimageobj.cpp	Tue Dec 04 12:32:59 2007 +0000
@@ -193,7 +193,7 @@
 	QString nameAttr=attribut ("orgName",originalFilename);
 
     return singleElement ("floatimage",  
-		getOrnAttr() 
+		getOrnXMLAttr() 
 		+useOrientAttr 
 		+saveInMapAttr 
 		+exportAttr  
diff -r 513107d1ed59 -r d7d0708b1c60 highlighter.cpp
--- a/highlighter.cpp	Tue Dec 04 12:32:56 2007 +0000
+++ b/highlighter.cpp	Tue Dec 04 12:32:59 2007 +0000
@@ -85,6 +85,7 @@
 					<< "\\bsetURL\\b" 
 					<< "\\bsetVymLink\\b" 
 					<< "\\bsetFlag\\b" 
+					<< "\\bsortChildren\\b" 
 					<< "\\btoggleFlag\\b" 
 					<< "\\bunscroll\\b" 
 					<< "\\bunscrollChilds\\b" 
diff -r 513107d1ed59 -r d7d0708b1c60 mainwindow.cpp
--- a/mainwindow.cpp	Tue Dec 04 12:32:56 2007 +0000
+++ b/mainwindow.cpp	Tue Dec 04 12:32:59 2007 +0000
@@ -1395,7 +1395,7 @@
     a = new QAction( tr( "Autosave","Settings action"), this);
     a->setStatusTip( tr( "Autosave"));
 	a->setToggleAction(true);
-	a->setOn ( settings.value ("/mapeditor/autosave/use",true).toBool());
+	a->setOn ( settings.value ("/mapeditor/autosave/use",false).toBool());
     connect( a, SIGNAL( triggered() ), this, SLOT( settingsAutosaveToggle() ) );
 	settingsMenu->addAction (a);
 	actionSettingsAutosaveToggle=a;
@@ -1406,8 +1406,8 @@
 	settingsMenu->addAction (a);
 	actionSettingsAutosaveTime=a;
 
-    a = new QAction( tr( "Backup file","Settings action"), this);
-    a->setStatusTip( tr( "Write backup file"));
+    a = new QAction( tr( "Write backup file on save","Settings action"), this);
+    a->setStatusTip( tr( "Write backup file on save"));
 	a->setToggleAction(true);
 	a->setOn ( settings.value ("/mainwindow/writeBackupFile",false).toBool());
     connect( a, SIGNAL( triggered() ), this, SLOT( settingsWriteBackupFileToggle() ) );
@@ -2845,11 +2845,22 @@
 	*/
 }
 
+#include "attribute.h"
 #include "attributedialog.h"
 void Main::editAttribute()
 {
-	AttributeDialog dia;
-	dia.exec();
+	MapEditor *me=currentMapEditor();
+	if (me)
+	{
+		BranchObj *bo=me->getSelectedBranch();
+		if (bo)
+		{
+			AttributeDialog dia(this);
+			dia.setTable (me->attributeTable() );
+			dia.setBranch (bo);
+			dia.exec();
+		}
+	}	
 	/*
 	if (currentMapEditor())
 	{
@@ -3472,12 +3483,11 @@
 
 	if(currentMapEditor())
 	{
-		LinkableMapObj *sel=currentMapEditor()->getSelection();
-		if (sel && (typeid(*sel) == typeid(BranchObj) ||
-		           typeid(*sel) == typeid(MapCenterObj)))
+		BranchObj *bo=currentMapEditor()->getSelectedBranch();
+		if (bo) 
 		{
 			branchPropertyWindow->setMapEditor(currentMapEditor());
-			branchPropertyWindow->setBranch((BranchObj*)sel);
+			branchPropertyWindow->setBranch(bo);
 			return;
 		}
 		
diff -r 513107d1ed59 -r d7d0708b1c60 mapcenterobj.cpp
--- a/mapcenterobj.cpp	Tue Dec 04 12:32:56 2007 +0000
+++ b/mapcenterobj.cpp	Tue Dec 04 12:32:59 2007 +0000
@@ -137,7 +137,7 @@
 	QString linkAttr=getLinkAttr();
 
     s=beginElement ("mapcenter" 
-		+getOrnAttr() 
+		+getOrnXMLAttr() 
 		+areaAttr 
 		+idAttr 
 		+getIncludeImageAttr() );
diff -r 513107d1ed59 -r d7d0708b1c60 mapeditor.cpp
--- a/mapeditor.cpp	Tue Dec 04 12:32:56 2007 +0000
+++ b/mapeditor.cpp	Tue Dec 04 12:32:59 2007 +0000
@@ -130,7 +130,7 @@
 	blockReposition=false;
 	blockSaveState=false;
 
-	hidemode=BranchObj::HideNone;
+	hidemode=HideNone;
 
 	// Create temporary files
 	makeTmpDirs();
@@ -153,6 +153,20 @@
 
 	// Network
 	netstate=Offline;
+
+	// Attributes
+	attrTable= new AttributeTable();
+	attrTable->addKey ("Key A - Priority");
+	attrTable->addValue ("Key A","P 1");
+	attrTable->addValue ("Key A","P 2");
+	attrTable->addValue ("Key A","P 3");
+	attrTable->addValue ("Key A","P 4");
+	attrTable->addKey ("Key B");
+	attrTable->addValue ("Key B","w1");
+	attrTable->addValue ("Key B","w2");
+	attrTable->addKey ("Key Prio");
+	attrTable->addValue ("Key Prio","Prio 1");
+	attrTable->addValue ("Key Prio","Prio 2");
 }
 
 MapEditor::~MapEditor()
@@ -1765,7 +1779,7 @@
 	return pix;
 }
 
-void MapEditor::setHideTmpMode (BranchObj::HideTmpMode mode)
+void MapEditor::setHideTmpMode (HideTmpMode mode)
 {
 	hidemode=mode;
 	mapCenter->setHideTmp (hidemode);
@@ -1773,7 +1787,7 @@
 	scene()->update();
 }
 
-BranchObj::HideTmpMode MapEditor::getHideTmpMode()
+HideTmpMode MapEditor::getHideTmpMode()
 {
 	return hidemode;
 }
@@ -1783,9 +1797,9 @@
 	// should be called before and after exports
 	// depending on the settings
 	if (b && settings.value("/export/useHideExport","true")=="true")
-		setHideTmpMode (BranchObj::HideExport);
+		setHideTmpMode (HideExport);
 	else	
-		setHideTmpMode (BranchObj::HideNone);
+		setHideTmpMode (HideNone);
 }
 
 void MapEditor::exportASCII(QString fname,bool askName)
@@ -4158,6 +4172,11 @@
 	}
 }
 
+AttributeTable* MapEditor::attributeTable()
+{
+	return attrTable;
+}
+
 void MapEditor::testFunction1()
 {
 /*
@@ -4194,12 +4213,20 @@
 	
 void MapEditor::testFunction2()
 {
+	// Toggle hidemode
+	if (hidemode==HideExport)
+		setHideTmpMode (HideNone);
+	else	
+		setHideTmpMode (HideExport);
+		
+/*
 	LinkableMapObj *lmo=xelection.getBranch();
 	if (lmo) 
 	{
 		cout << "LMO::id="<<lmo->getID().ascii()<<endl;
 		cout << " BO::id="<<((BranchObj*)lmo)->getID().ascii()<<endl;
 	}	
+*/	
 }
 
 void MapEditor::contextMenuEvent ( QContextMenuEvent * e )
diff -r 513107d1ed59 -r d7d0708b1c60 mapeditor.h
--- a/mapeditor.h	Tue Dec 04 12:32:56 2007 +0000
+++ b/mapeditor.h	Tue Dec 04 12:32:59 2007 +0000
@@ -143,8 +143,8 @@
 	void setSmoothPixmap(bool); //!< Set or unset smoothing of pixmaps
 private:
     QPixmap getPixmap();
-	void setHideTmpMode (BranchObj::HideTmpMode);	// temporary hide stuff
-	BranchObj::HideTmpMode getHideTmpMode();		// temporary hide stuff
+	void setHideTmpMode (HideTmpMode);	// temporary hide stuff
+	HideTmpMode getHideTmpMode();		// temporary hide stuff
 public:
 	/*! Set or unset temporary hiding of objects during export  */
 	void setExportMode (bool);
@@ -321,6 +321,7 @@
     void importDir();
 	void followXLink (int);
 	void editXLink (int);
+	AttributeTable* attributeTable();
     void testFunction1();					// just testing new stuff
     void testFunction2();					// just testing new stuff
 											// set /mainwindo/showTestMenu=true...
@@ -400,6 +401,8 @@
 
 	Parser parser;				// Parser stuff for scripting
 
+	AttributeTable *attrTable;
+
 	bool printFrame;			// Print frame around map
 	bool printFooter;			// Print footer below map
 
@@ -426,10 +429,7 @@
 	bool EOFind;				// true, if search failed
 
 	QPoint exportOffset;		// set before export, used in save
-	BranchObj::HideTmpMode hidemode;	// true while exporting to hide some stuff
-
-	QList <Attribute> attributes;	// List with attributes
-
+	HideTmpMode hidemode;	// true while exporting to hide some stuff
 
 	// Network connections **Experimental**
 	NetState netstate;			// offline, client, server
diff -r 513107d1ed59 -r d7d0708b1c60 ornamentedobj.cpp
--- a/ornamentedobj.cpp	Tue Dec 04 12:32:56 2007 +0000
+++ b/ornamentedobj.cpp	Tue Dec 04 12:32:59 2007 +0000
@@ -57,6 +57,8 @@
 	standardFlags->clone(standardFlagsDefault);
 	standardFlags->setName ("standardFlags");
 
+	attributes.clear();
+
 	frame = new FrameObj (scene);
 
 	hideExport=false;
@@ -342,6 +344,16 @@
 	return vymLink;
 }
 
+QList <Attribute> OrnamentedObj::getAttributes()
+{
+	return attributes;
+}
+
+
+void OrnamentedObj::setAttributes (const QList <Attribute> &al)
+{
+	attributes=al;
+}
 
 void OrnamentedObj::clearStandardFlags()
 {
@@ -459,7 +471,7 @@
 	return hidden;
 }	
 
-QString OrnamentedObj::getOrnAttr()
+QString OrnamentedObj::getOrnXMLAttr()
 {
 	QString posAttr;
 
diff -r 513107d1ed59 -r d7d0708b1c60 ornamentedobj.h
--- a/ornamentedobj.h	Tue Dec 04 12:32:56 2007 +0000
+++ b/ornamentedobj.h	Tue Dec 04 12:32:59 2007 +0000
@@ -1,6 +1,7 @@
 #ifndef ORNAMENTEDOBJ_H
 #define ORNAMENTEDOBJ_H
 
+#include "attribute.h"
 #include "frameobj.h"
 #include "linkablemapobj.h"
 
@@ -58,11 +59,16 @@
     virtual QString getNoteASCII(const QString &indent, const int &width); // returns note	(ASCII)
     virtual QString getNoteASCII();			// returns note	(ASCII)
     virtual QString getNoteOpenDoc();		// returns note	(OpenDoc)
+
     virtual void setURL (QString);
     virtual QString getURL ();
+
     virtual void setVymLink (QString);
     virtual QString getVymLink ();
 
+	virtual QList <Attribute> getAttributes ();
+	virtual void setAttributes (const QList <Attribute> &al);
+
 	virtual void clearStandardFlags();
 	virtual void toggleStandardFlag(QString, bool exclusive=false);
 	virtual void activateStandardFlag(QString);
@@ -76,7 +82,7 @@
 	virtual void setHideInExport(bool);		// set export of object (and childs)
 	virtual bool hideInExport();
 	virtual bool isHidden ();
-	virtual QString getOrnAttr();			// get attributes for saveToDir
+	virtual QString getOrnXMLAttr();		// get attributes for saveToDir
 
 protected:
     HeadingObj *heading;			// Heading
@@ -88,6 +94,8 @@
 	QRectF ornamentsBBox;			// bbox of flags and heading
 	QString url;					// url to external doc
 	QString vymLink;				// path to another map
+	QList <Attribute> attributes;	// List with attributes
+
 	bool hideExport;				// hide in exports if set
 	bool hidden;					// true if temporary hidden
 };
diff -r 513107d1ed59 -r d7d0708b1c60 tex/vym.changelog
--- a/tex/vym.changelog	Tue Dec 04 12:32:56 2007 +0000
+++ b/tex/vym.changelog	Tue Dec 04 12:32:59 2007 +0000
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Dec  4 11:46:02 CET 2007 - uwedr@suse.de
+
+- Bugfix: Temporary hide stuff during export 
+
+-------------------------------------------------------------------
+Mon Dec  3 20:57:15 CET 2007 - uwedr@suse.de
+
+- Bugfix: (Maint.) Exchanged pre- and postscript in XHTML Export dialog
+
 -------------------------------------------------------------------
 Fri Nov  9 10:44:59 CET 2007 - uwedr@suse.de
 
diff -r 513107d1ed59 -r d7d0708b1c60 version.h
--- a/version.h	Tue Dec 04 12:32:56 2007 +0000
+++ b/version.h	Tue Dec 04 12:32:59 2007 +0000
@@ -7,7 +7,7 @@
 #define __VYM_VERSION "1.11.3"
 //#define __VYM_CODENAME "Codename: 1.10.0-RC-3"
 #define __VYM_CODENAME "Codename: development version"
-#define __VYM_BUILD_DATE "2007-11-09"
+#define __VYM_BUILD_DATE "2007-12-04"
 
 
 bool checkVersion(const QString &);
diff -r 513107d1ed59 -r d7d0708b1c60 vym.pro
--- a/vym.pro	Tue Dec 04 12:32:56 2007 +0000
+++ b/vym.pro	Tue Dec 04 12:32:59 2007 +0000
@@ -118,7 +118,6 @@
 
 FORMS = \
 	attributewidget.ui \
-	attributedialog.ui \
 	branchpropwindow.ui \
 	exportxhtmldialog.ui \
 	extrainfodialog.ui \