1.1 Binary file demos/todo.vym has changed
2.1 --- a/exportxhtmldialog.ui Wed May 18 07:39:51 2005 +0000
2.2 +++ b/exportxhtmldialog.ui Wed May 18 07:39:58 2005 +0000
2.3 @@ -8,8 +8,8 @@
2.4 <rect>
2.5 <x>0</x>
2.6 <y>0</y>
2.7 - <width>582</width>
2.8 - <height>599</height>
2.9 + <width>614</width>
2.10 + <height>757</height>
2.11 </rect>
2.12 </property>
2.13 <property name="minimumSize">
2.14 @@ -27,7 +27,7 @@
2.15 </property>
2.16 <widget class="QLayoutWidget">
2.17 <property name="name">
2.18 - <cstring>layout33</cstring>
2.19 + <cstring>layout17</cstring>
2.20 </property>
2.21 <hbox>
2.22 <property name="name">
2.23 @@ -37,6 +37,14 @@
2.24 <property name="name">
2.25 <cstring>textLabel1</cstring>
2.26 </property>
2.27 + <property name="sizePolicy">
2.28 + <sizepolicy>
2.29 + <hsizetype>1</hsizetype>
2.30 + <vsizetype>5</vsizetype>
2.31 + <horstretch>0</horstretch>
2.32 + <verstretch>0</verstretch>
2.33 + </sizepolicy>
2.34 + </property>
2.35 <property name="text">
2.36 <string>Export to directory:</string>
2.37 </property>
2.38 @@ -45,11 +53,27 @@
2.39 <property name="name">
2.40 <cstring>lineEditDir</cstring>
2.41 </property>
2.42 + <property name="sizePolicy">
2.43 + <sizepolicy>
2.44 + <hsizetype>7</hsizetype>
2.45 + <vsizetype>0</vsizetype>
2.46 + <horstretch>0</horstretch>
2.47 + <verstretch>0</verstretch>
2.48 + </sizepolicy>
2.49 + </property>
2.50 </widget>
2.51 <widget class="QPushButton">
2.52 <property name="name">
2.53 <cstring>browseExportDirButton</cstring>
2.54 </property>
2.55 + <property name="sizePolicy">
2.56 + <sizepolicy>
2.57 + <hsizetype>0</hsizetype>
2.58 + <vsizetype>0</vsizetype>
2.59 + <horstretch>0</horstretch>
2.60 + <verstretch>0</verstretch>
2.61 + </sizepolicy>
2.62 + </property>
2.63 <property name="text">
2.64 <string>Browse</string>
2.65 </property>
2.66 @@ -148,83 +172,103 @@
2.67 </property>
2.68 <widget class="QLayoutWidget">
2.69 <property name="name">
2.70 - <cstring>layout7</cstring>
2.71 + <cstring>layout19</cstring>
2.72 </property>
2.73 <property name="geometry">
2.74 <rect>
2.75 - <x>10</x>
2.76 - <y>30</y>
2.77 - <width>540</width>
2.78 - <height>84</height>
2.79 + <x>9</x>
2.80 + <y>24</y>
2.81 + <width>562</width>
2.82 + <height>31</height>
2.83 </rect>
2.84 </property>
2.85 - <vbox>
2.86 + <hbox>
2.87 <property name="name">
2.88 <cstring>unnamed</cstring>
2.89 </property>
2.90 - <widget class="QLayoutWidget">
2.91 + <widget class="QLabel">
2.92 <property name="name">
2.93 - <cstring>layout5</cstring>
2.94 + <cstring>textLabel1_2</cstring>
2.95 </property>
2.96 - <hbox>
2.97 - <property name="name">
2.98 - <cstring>unnamed</cstring>
2.99 - </property>
2.100 - <widget class="QLabel">
2.101 - <property name="name">
2.102 - <cstring>textLabel1_2</cstring>
2.103 - </property>
2.104 - <property name="text">
2.105 - <string>CSS:</string>
2.106 - </property>
2.107 - </widget>
2.108 - <widget class="QLineEdit">
2.109 - <property name="name">
2.110 - <cstring>lineEditCSS</cstring>
2.111 - </property>
2.112 - </widget>
2.113 - <widget class="QPushButton">
2.114 - <property name="name">
2.115 - <cstring>browseCSSButton</cstring>
2.116 - </property>
2.117 - <property name="text">
2.118 - <string>Browse</string>
2.119 - </property>
2.120 - </widget>
2.121 - </hbox>
2.122 + <property name="text">
2.123 + <string>CSS:</string>
2.124 + </property>
2.125 + <property name="alignment">
2.126 + <set>AlignVCenter|AlignRight</set>
2.127 + </property>
2.128 </widget>
2.129 - <widget class="QLayoutWidget">
2.130 + <widget class="QLineEdit">
2.131 <property name="name">
2.132 - <cstring>layout6</cstring>
2.133 + <cstring>lineEditCSS</cstring>
2.134 </property>
2.135 - <hbox>
2.136 - <property name="name">
2.137 - <cstring>unnamed</cstring>
2.138 - </property>
2.139 - <widget class="QLabel">
2.140 - <property name="name">
2.141 - <cstring>textLabel2</cstring>
2.142 - </property>
2.143 - <property name="text">
2.144 - <string>XSL:</string>
2.145 - </property>
2.146 - </widget>
2.147 - <widget class="QLineEdit">
2.148 - <property name="name">
2.149 - <cstring>lineEditXSL</cstring>
2.150 - </property>
2.151 - </widget>
2.152 - <widget class="QPushButton">
2.153 - <property name="name">
2.154 - <cstring>browseXSLButton</cstring>
2.155 - </property>
2.156 - <property name="text">
2.157 - <string>Browse</string>
2.158 - </property>
2.159 - </widget>
2.160 - </hbox>
2.161 </widget>
2.162 - </vbox>
2.163 + <widget class="QPushButton">
2.164 + <property name="name">
2.165 + <cstring>browseCSSButton</cstring>
2.166 + </property>
2.167 + <property name="sizePolicy">
2.168 + <sizepolicy>
2.169 + <hsizetype>0</hsizetype>
2.170 + <vsizetype>0</vsizetype>
2.171 + <horstretch>0</horstretch>
2.172 + <verstretch>0</verstretch>
2.173 + </sizepolicy>
2.174 + </property>
2.175 + <property name="text">
2.176 + <string>Browse</string>
2.177 + </property>
2.178 + </widget>
2.179 + </hbox>
2.180 + </widget>
2.181 + <widget class="QLayoutWidget">
2.182 + <property name="name">
2.183 + <cstring>layout20</cstring>
2.184 + </property>
2.185 + <property name="geometry">
2.186 + <rect>
2.187 + <x>9</x>
2.188 + <y>64</y>
2.189 + <width>562</width>
2.190 + <height>31</height>
2.191 + </rect>
2.192 + </property>
2.193 + <hbox>
2.194 + <property name="name">
2.195 + <cstring>unnamed</cstring>
2.196 + </property>
2.197 + <widget class="QLabel">
2.198 + <property name="name">
2.199 + <cstring>textLabel2</cstring>
2.200 + </property>
2.201 + <property name="text">
2.202 + <string>XSL:</string>
2.203 + </property>
2.204 + <property name="alignment">
2.205 + <set>AlignVCenter|AlignRight</set>
2.206 + </property>
2.207 + </widget>
2.208 + <widget class="QLineEdit">
2.209 + <property name="name">
2.210 + <cstring>lineEditXSL</cstring>
2.211 + </property>
2.212 + </widget>
2.213 + <widget class="QPushButton">
2.214 + <property name="name">
2.215 + <cstring>browseXSLButton</cstring>
2.216 + </property>
2.217 + <property name="sizePolicy">
2.218 + <sizepolicy>
2.219 + <hsizetype>0</hsizetype>
2.220 + <vsizetype>0</vsizetype>
2.221 + <horstretch>0</horstretch>
2.222 + <verstretch>0</verstretch>
2.223 + </sizepolicy>
2.224 + </property>
2.225 + <property name="text">
2.226 + <string>Browse</string>
2.227 + </property>
2.228 + </widget>
2.229 + </hbox>
2.230 </widget>
2.231 </widget>
2.232 <widget class="QGroupBox">
2.233 @@ -234,96 +278,99 @@
2.234 <property name="title">
2.235 <string>Scripts</string>
2.236 </property>
2.237 - <widget class="QLabel">
2.238 + </widget>
2.239 + <widget class="QLayoutWidget">
2.240 + <property name="name">
2.241 + <cstring>layout34</cstring>
2.242 + </property>
2.243 + <grid>
2.244 <property name="name">
2.245 - <cstring>textLabel1_3</cstring>
2.246 + <cstring>unnamed</cstring>
2.247 </property>
2.248 - <property name="geometry">
2.249 - <rect>
2.250 - <x>12</x>
2.251 - <y>22</y>
2.252 - <width>110</width>
2.253 - <height>36</height>
2.254 - </rect>
2.255 - </property>
2.256 - <property name="text">
2.257 - <string>Before export:</string>
2.258 - </property>
2.259 - </widget>
2.260 - <widget class="QLineEdit">
2.261 - <property name="name">
2.262 - <cstring>lineEditPreScript</cstring>
2.263 - </property>
2.264 - <property name="geometry">
2.265 - <rect>
2.266 - <x>128</x>
2.267 - <y>26</y>
2.268 - <width>322</width>
2.269 - <height>28</height>
2.270 - </rect>
2.271 - </property>
2.272 - </widget>
2.273 - <widget class="QPushButton">
2.274 - <property name="name">
2.275 - <cstring>browsePreExportButton</cstring>
2.276 - </property>
2.277 - <property name="geometry">
2.278 - <rect>
2.279 - <x>456</x>
2.280 - <y>22</y>
2.281 - <width>94</width>
2.282 - <height>36</height>
2.283 - </rect>
2.284 - </property>
2.285 - <property name="text">
2.286 - <string>Browse</string>
2.287 - </property>
2.288 - </widget>
2.289 - <widget class="QLabel">
2.290 - <property name="name">
2.291 - <cstring>textLabel2_2</cstring>
2.292 - </property>
2.293 - <property name="geometry">
2.294 - <rect>
2.295 - <x>11</x>
2.296 - <y>61</y>
2.297 - <width>99</width>
2.298 - <height>36</height>
2.299 - </rect>
2.300 - </property>
2.301 - <property name="text">
2.302 - <string>After Export:</string>
2.303 - </property>
2.304 - </widget>
2.305 - <widget class="QLineEdit">
2.306 - <property name="name">
2.307 - <cstring>lineEditPostScript</cstring>
2.308 - </property>
2.309 - <property name="geometry">
2.310 - <rect>
2.311 - <x>116</x>
2.312 - <y>65</y>
2.313 - <width>333</width>
2.314 - <height>28</height>
2.315 - </rect>
2.316 - </property>
2.317 - </widget>
2.318 - <widget class="QPushButton">
2.319 - <property name="name">
2.320 - <cstring>browsePostExportButton</cstring>
2.321 - </property>
2.322 - <property name="geometry">
2.323 - <rect>
2.324 - <x>455</x>
2.325 - <y>61</y>
2.326 - <width>94</width>
2.327 - <height>36</height>
2.328 - </rect>
2.329 - </property>
2.330 - <property name="text">
2.331 - <string>Browse</string>
2.332 - </property>
2.333 - </widget>
2.334 + <widget class="QLabel" row="1" column="0">
2.335 + <property name="name">
2.336 + <cstring>textLabel2_2</cstring>
2.337 + </property>
2.338 + <property name="sizePolicy">
2.339 + <sizepolicy>
2.340 + <hsizetype>1</hsizetype>
2.341 + <vsizetype>5</vsizetype>
2.342 + <horstretch>0</horstretch>
2.343 + <verstretch>0</verstretch>
2.344 + </sizepolicy>
2.345 + </property>
2.346 + <property name="frameShape">
2.347 + <enum>NoFrame</enum>
2.348 + </property>
2.349 + <property name="text">
2.350 + <string>After Export:</string>
2.351 + </property>
2.352 + <property name="alignment">
2.353 + <set>AlignVCenter|AlignRight</set>
2.354 + </property>
2.355 + </widget>
2.356 + <widget class="QPushButton" row="1" column="2">
2.357 + <property name="name">
2.358 + <cstring>browsePostExportButton</cstring>
2.359 + </property>
2.360 + <property name="sizePolicy">
2.361 + <sizepolicy>
2.362 + <hsizetype>0</hsizetype>
2.363 + <vsizetype>0</vsizetype>
2.364 + <horstretch>0</horstretch>
2.365 + <verstretch>0</verstretch>
2.366 + </sizepolicy>
2.367 + </property>
2.368 + <property name="text">
2.369 + <string>Browse</string>
2.370 + </property>
2.371 + </widget>
2.372 + <widget class="QLineEdit" row="1" column="1">
2.373 + <property name="name">
2.374 + <cstring>lineEditPostScript</cstring>
2.375 + </property>
2.376 + </widget>
2.377 + <widget class="QPushButton" row="0" column="2">
2.378 + <property name="name">
2.379 + <cstring>browsePreExportButton</cstring>
2.380 + </property>
2.381 + <property name="sizePolicy">
2.382 + <sizepolicy>
2.383 + <hsizetype>0</hsizetype>
2.384 + <vsizetype>0</vsizetype>
2.385 + <horstretch>0</horstretch>
2.386 + <verstretch>0</verstretch>
2.387 + </sizepolicy>
2.388 + </property>
2.389 + <property name="text">
2.390 + <string>Browse</string>
2.391 + </property>
2.392 + </widget>
2.393 + <widget class="QLineEdit" row="0" column="1">
2.394 + <property name="name">
2.395 + <cstring>lineEditPreScript</cstring>
2.396 + </property>
2.397 + </widget>
2.398 + <widget class="QLabel" row="0" column="0">
2.399 + <property name="name">
2.400 + <cstring>textLabel1_3</cstring>
2.401 + </property>
2.402 + <property name="sizePolicy">
2.403 + <sizepolicy>
2.404 + <hsizetype>1</hsizetype>
2.405 + <vsizetype>5</vsizetype>
2.406 + <horstretch>0</horstretch>
2.407 + <verstretch>0</verstretch>
2.408 + </sizepolicy>
2.409 + </property>
2.410 + <property name="text">
2.411 + <string>Before export:</string>
2.412 + </property>
2.413 + <property name="alignment">
2.414 + <set>AlignVCenter|AlignRight</set>
2.415 + </property>
2.416 + </widget>
2.417 + </grid>
2.418 </widget>
2.419 <spacer>
2.420 <property name="name">
2.421 @@ -338,7 +385,7 @@
2.422 <property name="sizeHint">
2.423 <size>
2.424 <width>20</width>
2.425 - <height>31</height>
2.426 + <height>90</height>
2.427 </size>
2.428 </property>
2.429 </spacer>
2.430 @@ -458,18 +505,24 @@
2.431 <slot>xslChanged()</slot>
2.432 </connection>
2.433 <connection>
2.434 + <sender>warningsButton</sender>
2.435 + <signal>toggled(bool)</signal>
2.436 + <receiver>ExportXHTMLDialog</receiver>
2.437 + <slot>warningsButtonPressed(bool)</slot>
2.438 + </connection>
2.439 + <connection>
2.440 + <sender>saveSettingsInMapButton</sender>
2.441 + <signal>toggled(bool)</signal>
2.442 + <receiver>ExportXHTMLDialog</receiver>
2.443 + <slot>saveSettingsInMapButtonPressed(bool)</slot>
2.444 + </connection>
2.445 + <connection>
2.446 <sender>browsePreExportButton</sender>
2.447 <signal>pressed()</signal>
2.448 <receiver>ExportXHTMLDialog</receiver>
2.449 <slot>browsePreExportButtonPressed()</slot>
2.450 </connection>
2.451 <connection>
2.452 - <sender>browsePostExportButton</sender>
2.453 - <signal>pressed()</signal>
2.454 - <receiver>ExportXHTMLDialog</receiver>
2.455 - <slot>browsePostExportButtonPressed()</slot>
2.456 - </connection>
2.457 - <connection>
2.458 <sender>lineEditPreScript</sender>
2.459 <signal>textChanged(const QString&)</signal>
2.460 <receiver>ExportXHTMLDialog</receiver>
2.461 @@ -482,16 +535,10 @@
2.462 <slot>postscriptChanged()</slot>
2.463 </connection>
2.464 <connection>
2.465 - <sender>warningsButton</sender>
2.466 - <signal>toggled(bool)</signal>
2.467 + <sender>browsePostExportButton</sender>
2.468 + <signal>pressed()</signal>
2.469 <receiver>ExportXHTMLDialog</receiver>
2.470 - <slot>warningsButtonPressed(bool)</slot>
2.471 - </connection>
2.472 - <connection>
2.473 - <sender>saveSettingsInMapButton</sender>
2.474 - <signal>toggled(bool)</signal>
2.475 - <receiver>ExportXHTMLDialog</receiver>
2.476 - <slot>saveSettingsInMapButtonPressed(bool)</slot>
2.477 + <slot>browsePostExportButtonPressed()</slot>
2.478 </connection>
2.479 </connections>
2.480 <includes>
3.1 --- a/mainwindow.cpp Wed May 18 07:39:51 2005 +0000
3.2 +++ b/mainwindow.cpp Wed May 18 07:39:58 2005 +0000
3.3 @@ -372,6 +372,7 @@
3.4 menuBar()->insertItem( tr( "&Edit" ), menu );
3.5
3.6 QAction *a;
3.7 + QAction *alt;
3.8 a = new QAction( tr( "Undo" ), QPixmap( editundo_xpm ), tr( "&Undo" ), CTRL + Key_Z, this, "editUndo" );
3.9 connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) );
3.10 a->setEnabled (false);
3.11 @@ -421,13 +422,19 @@
3.12 actionEditMoveDown=a;
3.13
3.14
3.15 - a = new QAction( tr( "Scroll branch" ), QPixmap(flag_scrolled_right_xpm), tr( "Scroll branch" ), Key_ScrollLock, this, "scroll" );
3.16 + a = new QAction( tr( "Scroll branch" ), QPixmap(flag_scrolled_right_xpm), tr( "Scroll branch" ), Key_ScrollLock, this, "scroll" );
3.17 connect( a, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
3.18 - a->setEnabled (false);
3.19 - a->addTo( tb );
3.20 - a->addTo( menu );
3.21 - actionListBranches.append(a);
3.22 - actionEditToggleScroll=a;
3.23 + alt = new QAction( tr( "Scroll branch" ), QPixmap(flag_scrolled_right_xpm), tr( "Scroll branch" ), Key_S, this, "scroll" );
3.24 + connect( alt, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
3.25 + #if defined(Q_OS_MACX)
3.26 + actionEditToggleScroll=alt;
3.27 + #else
3.28 + actionEditToggleScroll=a;
3.29 + #endif
3.30 + actionEditToggleScroll->setEnabled (false);
3.31 + actionEditToggleScroll->addTo( tb );
3.32 + actionEditToggleScroll->addTo( menu );
3.33 + actionListBranches.append(actionEditToggleScroll);
3.34
3.35 a = new QAction( tr( "Unscroll all" ), QPixmap(), tr( "Unscroll all scrolled branches" ), 0, this, "scroll" );
3.36 connect( a, SIGNAL( activated() ), this, SLOT( editUnScrollAll() ) );
3.37 @@ -503,16 +510,18 @@
3.38 // Shortcuts to modify heading:
3.39 a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Enter, this, "editHeading" );
3.40 connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
3.41 - a->setEnabled (false);
3.42 - a->addTo ( menu );
3.43 actionListBranches.append(a);
3.44 - actionEditHeading=a;
3.45 a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Return, this, "editHeading" );
3.46 connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
3.47 actionListBranches.append(a);
3.48 actionEditHeading=a;
3.49 a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_F2, this, "editHeading" );
3.50 connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
3.51 + a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_E, this, "editHeading" );
3.52 + connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
3.53 + a->setEnabled (false);
3.54 + a->addTo ( menu );
3.55 + actionEditHeading=a;
3.56 actionListBranches.append(a);
3.57
3.58 // Shortcut to delete selection
3.59 @@ -523,15 +532,17 @@
3.60 actionEditDelete=a;
3.61
3.62 // Shortcut to add branch
3.63 - #if defined (Q_OS_MACX)
3.64 - a = new QAction( tr( "Add a branch as child of selection" ),tr( "Add branch as child" ), CTRL + Key_I, this, "newBranch" );
3.65 - #else
3.66 + alt = new QAction( tr( "Add a branch as child of selection" ),tr( "Add branch as child" ), Key_A, this, "newBranch" );
3.67 + connect( alt, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
3.68 a = new QAction( tr( "Add a branch as child of selection" ),tr( "Add branch as child" ), Key_Insert, this, "newBranch" );
3.69 - #endif
3.70 connect( a, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
3.71 a->setEnabled (false);
3.72 actionListBranches.append(a);
3.73 - actionEditAddBranch=a;
3.74 + #if defined (Q_OS_MACX)
3.75 + actionEditAddBranch=alt;
3.76 + #else
3.77 + actionEditAddBranch=a;
3.78 + #endif
3.79
3.80 // Add branch by inserting it at selection
3.81 a = new QAction( tr( "Add a branch by inserting and making selection its child" ),tr( "Add branch (insert)" ), ALT + Key_Insert, this, "newBranchHere" );
4.1 --- a/mapeditor.cpp Wed May 18 07:39:51 2005 +0000
4.2 +++ b/mapeditor.cpp Wed May 18 07:39:58 2005 +0000
4.3 @@ -322,6 +322,9 @@
4.4 selectionLast=NULL;
4.5 movingObj=NULL;
4.6
4.7 + defXLinkWidth=1;
4.8 + defXLinkColor=QColor (230,230,230);
4.9 +
4.10 mapChanged=false;
4.11 mapDefault=true;
4.12 mapUnsaved=false;
4.13 @@ -512,8 +515,8 @@
4.14 attribut("backgroundColor", mapCanvas->backgroundColor().name() ) +
4.15 attribut("linkStyle", ls ) +
4.16 attribut("linkColor", defLinkColor.name() ) +
4.17 - attribut("xlinkColor", defXLinkColor.name() ) +
4.18 - attribut("xlinkWidth", QString().setNum(defXLinkWidth,10) ) +
4.19 + attribut("defXLinkColor", defXLinkColor.name() ) +
4.20 + attribut("defXLinkWidth", QString().setNum(defXLinkWidth,10) ) +
4.21 colhint;
4.22 s+=beginElement("vymmap",mapAttr);
4.23 incIndent();
4.24 @@ -864,7 +867,7 @@
4.25 double paperAspect = (double)metrics.width() / (double)metrics.height();
4.26 double mapAspect = (double)totalBBox.width() / (double)totalBBox.height();
4.27
4.28 - QRect mapRect=mapCenter->getTotalBBox();
4.29 + QRect mapRect=totalBBox;
4.30 QCanvasRectangle *frame=NULL;
4.31 QCanvasText *footerFN=NULL;
4.32 QCanvasText *footerDate=NULL;
4.33 @@ -874,14 +877,22 @@
4.34 if (printFrame)
4.35 {
4.36 // Print frame around map
4.37 - mapRect.setRect (mapRect.x()-10, mapRect.y()-10,
4.38 - mapRect.width()+20, mapRect.height()+20);
4.39 + mapRect.setRect (totalBBox.x()-10, totalBBox.y()-10,
4.40 + totalBBox.width()+20, totalBBox.height()+20);
4.41 frame=new QCanvasRectangle (mapRect,mapCanvas);
4.42 frame->setBrush (QColor(white));
4.43 frame->setPen (QColor(black));
4.44 frame->setZ(0);
4.45 frame->show();
4.46 }
4.47 + /* FIXME testing
4.48 + QCanvasLine *l=new QCanvasLine (mapCanvas);
4.49 + l->setPoints (0,0,mapRect.width(),mapRect.height());
4.50 + l->setPen (QPen(QColor(black), 1));
4.51 + l->setZ (200);
4.52 + l->show();
4.53 + */
4.54 +
4.55 if (printFooter)
4.56 {
4.57 // Print footer below map
4.58 @@ -899,10 +910,8 @@
4.59 footerDate->move (mapRect.x()+mapRect.width()-footerDate->boundingRect().width(), mapRect.y() + mapRect.height() );
4.60 footerDate->setZ(Z_TEXT);
4.61 footerDate->show();
4.62 - mapRect.setRect (mapRect.x(), mapRect.y(),
4.63 - mapRect.width(), mapRect.height()+20);
4.64 }
4.65 - pp.setWindow (mapRect.x(), mapRect.y(), mapRect.width(), mapRect.height());
4.66 + pp.setWindow (mapRect.x(), mapRect.y(), mapRect.width(), mapRect.height()+20);
4.67 } else
4.68 {
4.69 pp.setWindow (mapRect);
4.70 @@ -2395,6 +2404,8 @@
4.71 {
4.72 linkstyle=ls;
4.73
4.74 + setChanged();
4.75 + saveState();
4.76 BranchObj *bo;
4.77 bo=mapCenter->first();
4.78 bo=bo->next();
4.79 @@ -2403,8 +2414,7 @@
4.80 bo->setLinkStyle(bo->getDefLinkStyle());
4.81 bo=bo->next();
4.82 }
4.83 - //setChanged();
4.84 - //saveState();
4.85 + mapCenter->reposition();
4.86 }
4.87
4.88 LinkStyle MapEditor::getLinkStyle ()
4.89 @@ -2732,6 +2742,7 @@
4.90 {
4.91 EditXLinkDialog dia;
4.92 dia.setXLink (xlo);
4.93 + dia.setSelection(selection);
4.94 if (dia.exec() == QDialog::Accepted)
4.95 {
4.96 if (dia.useSettingsGlobal() )
5.1 --- a/tex/vym.tex Wed May 18 07:39:51 2005 +0000
5.2 +++ b/tex/vym.tex Wed May 18 07:39:58 2005 +0000
5.3 @@ -718,6 +718,9 @@
5.4 & - & insert branch and make selection its child& \\
5.5 & - & restructured branch context menu & \\
5.6 in a basic version (straight line) & 2005-04-15\\
5.7 + & - & Bugfix: Changing linkstyle now automatically redraws all
5.8 + links again& \\
5.9 + & - & New shortcuts (F1-F3) for use on Mac OS X& \\
5.10 1.6.4 & - & xLinks (arbitrary connection between 2 branches) works
5.11 in a basic version (straight line) & 2005-04-15\\
5.12 1.6.3 & - & Bugfix: Saving of selection to a vym part (.vyp) &2005-03-30\\
6.1 --- a/version.h Wed May 18 07:39:51 2005 +0000
6.2 +++ b/version.h Wed May 18 07:39:58 2005 +0000
6.3 @@ -2,6 +2,6 @@
6.4 #define VERSION_H
6.5
6.6 #define __VYM_VERSION__ "1.6.5"
6.7 -#define __BUILD_DATE__ "May 4, 2005"
6.8 +#define __BUILD_DATE__ "May 17, 2005"
6.9
6.10 #endif
7.1 --- a/vym.pro Wed May 18 07:39:51 2005 +0000
7.2 +++ b/vym.pro Wed May 18 07:39:58 2005 +0000
7.3 @@ -1,74 +1,8 @@
7.4 -
7.5 -
7.6 -
7.7 -
7.8 -
7.9 -TARGET = vym
7.10 -TRANSLATIONS += lang/vym_de.ts
7.11 -TRANSLATIONS += lang/vym_en.ts
7.12 -
7.13 -
7.14 -
7.15 -DESTROOT = /usr
7.16 -
7.17 -target.path = $${DESTROOT}/bin
7.18 -INSTALLS += target
7.19 -
7.20 -support.files = styles/ scripts/ icons/ lang/
7.21 -support.path = $${DESTROOT}/share/vym
7.22 -INSTALLS += support
7.23 -
7.24 -doc.files = doc/*
7.25 -doc.path = $${DESTROOT}/share/doc/packages/vym
7.26 -INSTALLS += doc
7.27 -
7.28 -demo.files = demos/
7.29 -demo.path = $${DESTROOT}/share/vym
7.30 -INSTALLS += demo
7.31 -
7.32 -
7.33 -
7.34 -
7.35 -
7.36 -
7.37 -
7.38 -
7.39 -
7.40 -
7.41 -
7.42 -
7.43 -
7.44 -
7.45 -
7.46 -
7.47 -
7.48 -
7.49 -
7.50 -
7.51 -
7.52 -
7.53 -
7.54 -
7.55 -
7.56 -
7.57 -
7.58 -
7.59 -
7.60 -
7.61 -
7.62 -
7.63 -
7.64 -
7.65 -
7.66 -
7.67 -
7.68 -
7.69 TEMPLATE = app
7.70 LANGUAGE = C++
7.71
7.72 CONFIG += qt warn_on release
7.73
7.74 -
7.75 HEADERS += branchobj.h \
7.76 exports.h \
7.77 findwindow.h \
7.78 @@ -95,6 +29,7 @@
7.79 xml.h \
7.80 settings.h \
7.81 options.h
7.82 +
7.83 SOURCES += branchobj.cpp \
7.84 exports.cpp \
7.85 findwindow.cpp \
7.86 @@ -121,9 +56,74 @@
7.87 xml.cpp \
7.88 settings.cpp \
7.89 options.cpp
7.90 +
7.91 FORMS = exporthtmldialog.ui \
7.92 exportxhtmldialog.ui \
7.93 showtextdialog.ui \
7.94 extrainfodialog.ui \
7.95 editxlinkdialog.ui
7.96
7.97 +TARGET = vym
7.98 +TRANSLATIONS += lang/vym_de.ts
7.99 +TRANSLATIONS += lang/vym_en.ts
7.100 +
7.101 +
7.102 +
7.103 +DESTROOT = /usr
7.104 +
7.105 +target.path = $${DESTROOT}/bin
7.106 +INSTALLS += target
7.107 +
7.108 +support.files = styles/ scripts/ icons/ lang/
7.109 +support.path = $${DESTROOT}/share/vym
7.110 +INSTALLS += support
7.111 +
7.112 +doc.files = doc/*
7.113 +doc.path = $${DESTROOT}/share/doc/packages/vym
7.114 +INSTALLS += doc
7.115 +
7.116 +demo.files = demos/
7.117 +demo.path = $${DESTROOT}/share/vym
7.118 +INSTALLS += demo
7.119 +
7.120 +
7.121 +
7.122 +
7.123 +
7.124 +
7.125 +
7.126 +
7.127 +
7.128 +
7.129 +
7.130 +
7.131 +
7.132 +
7.133 +
7.134 +
7.135 +
7.136 +
7.137 +
7.138 +
7.139 +
7.140 +
7.141 +
7.142 +
7.143 +
7.144 +
7.145 +
7.146 +
7.147 +
7.148 +
7.149 +
7.150 +
7.151 +
7.152 +
7.153 +
7.154 +
7.155 +
7.156 +
7.157 +
7.158 +
7.159 +
7.160 +
8.1 --- a/xlinkobj.cpp Wed May 18 07:39:51 2005 +0000
8.2 +++ b/xlinkobj.cpp Wed May 18 07:39:58 2005 +0000
8.3 @@ -38,11 +38,10 @@
8.4 visBranch=NULL;
8.5 xLinkState=undefinedXLink;
8.6
8.7 - width=1;
8.8 color=QColor (180,180,180);
8.9 line=new QCanvasLine (canvas);
8.10 - line->setPoints (0,0,200,200);
8.11 - line->setPen (QPen(color, 1));
8.12 + width=1;
8.13 + line->setPen (QPen(color, width));
8.14 line->setZ (Z_XLINK);
8.15
8.16 poly=new QCanvasPolygon (canvas);
8.17 @@ -55,7 +54,6 @@
8.18 void XLinkObj::copy (XLinkObj* other)
8.19 {
8.20 // FIXME copy not used yet
8.21 - cout << "LO::copy called\n";
8.22 MapObj::copy (other);
8.23 setVisibility (other->visible);
8.24 beginBranch=other->beginBranch;
8.25 @@ -198,6 +196,7 @@
8.26 {
8.27 beginPos=a;
8.28 endPos=b;
8.29 + line->setPen (QPen(color, width));
8.30 line->setPoints (a.x(), a.y(), b.x(), b.y());
8.31 }
8.32 }