1.1 --- a/mainwindow.cpp Wed Mar 29 09:11:09 2006 +0000
1.2 +++ b/mainwindow.cpp Mon Apr 10 11:21:35 2006 +0000
1.3 @@ -19,51 +19,7 @@
1.4 #include <cstdlib>
1.5 #include <typeinfo>
1.6
1.7 -#include "icons/filenew.xpm"
1.8 -#include "icons/fileopen.xpm"
1.9 -#include "icons/filesave.xpm"
1.10 -#include "icons/fileprint.xpm"
1.11 -#include "icons/editundo.xpm"
1.12 -#include "icons/editredo.xpm"
1.13 -#include "icons/editcopy.xpm"
1.14 -#include "icons/editcut.xpm"
1.15 -#include "icons/editpaste.xpm"
1.16 -#include "icons/editmoveup.xpm"
1.17 -#include "icons/editmovedown.xpm"
1.18 -#include "icons/formatcoloritem.xpm"
1.19 -#include "icons/formatcolorbranch.xpm"
1.20 -#include "icons/formatcolorpicker.xpm"
1.21 -#include "icons/viewzoomreset.xpm"
1.22 -#include "icons/viewzoomin.xpm"
1.23 -#include "icons/viewzoomout.xpm"
1.24 -#include "icons/modecolor.xpm"
1.25 -#include "icons/modelink.xpm"
1.26 -#include "icons/modecopy.xpm"
1.27 -#include "icons/flag-questionmark.xpm"
1.28 -#include "icons/flag-exclamationmark.xpm"
1.29 -#include "icons/flag-hook-green.xpm"
1.30 -#include "icons/flag-cross-red.xpm"
1.31 -#include "icons/flag-stopsign.xpm"
1.32 -#include "icons/flag-smiley-good.xpm"
1.33 -#include "icons/flag-smiley-sad.xpm"
1.34 -#include "icons/flag-clock.xpm"
1.35 -#include "icons/flag-lamp.xpm"
1.36 -#include "icons/flag-arrow-up.xpm"
1.37 -#include "icons/flag-arrow-down.xpm"
1.38 -#include "icons/flag-thumb-up.xpm"
1.39 -#include "icons/flag-thumb-down.xpm"
1.40 -#include "icons/flag-heart.xpm"
1.41 -#include "icons/flag-flash.xpm"
1.42 -#include "icons/flag-lifebelt.xpm"
1.43 -#include "icons/flag-note.xpm"
1.44 -#include "icons/flag-url.xpm"
1.45 -#include "icons/flag-vymlink.xpm"
1.46 -#include "icons/flag-hideexport.xpm"
1.47 -#include "icons/flag-scrolled-right.xpm"
1.48 -#include "icons/flag-tmpUnscrolled-right.xpm"
1.49 -
1.50 #include "aboutdialog.h"
1.51 -#include "exporthtmldialog.h"
1.52 #include "exportoofiledialog.h"
1.53 #include "exports.h"
1.54 #include "exportxhtmldialog.h"
1.55 @@ -179,6 +135,9 @@
1.56
1.57 extern Settings settings;
1.58 extern Options options;
1.59 +extern QDir vymBaseDir;
1.60 +extern QString iconPath;
1.61 +extern QString flagsPath;
1.62
1.63 #if defined(Q_OS_LINUX)
1.64 extern void qt_wait_for_window_manager( QWidget* w );
1.65 @@ -363,12 +322,12 @@
1.66 // Keycodes: /usr/lib64/qt3/include/qnamespace.h
1.67
1.68 QAction *a;
1.69 - a = new QAction( tr( "New map","File menu" ), QPixmap( filenew_xpm ), tr( "&New..." ), CTRL + Key_N, this, "fileNew" );
1.70 + a = new QAction( tr( "New map","File menu" ), QPixmap( iconPath+"filenew.png"), tr( "&New..." ), CTRL + Key_N, this, "fileNew" );
1.71 connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
1.72 a->addTo( tb );
1.73 a->addTo( menu );
1.74
1.75 - a = new QAction( tr( "Open","File menu" ), QPixmap( fileopen_xpm), tr( "&Open..." ), CTRL + Key_O, this, "fileOpen" );
1.76 + a = new QAction( tr( "Open","File menu" ), QPixmap( iconPath+"fileopen.png"), tr( "&Open..." ), CTRL + Key_O, this, "fileOpen" );
1.77 connect( a, SIGNAL( activated() ), this, SLOT( fileLoad() ) );
1.78 a->addTo( tb );
1.79 a->addTo( menu );
1.80 @@ -378,13 +337,13 @@
1.81 menu->insertItem (tr("Open Recent"),lastMapsMenu );
1.82 menu->insertSeparator();
1.83
1.84 - a = new QAction( tr( "Save" ), QPixmap( filesave_xpm ), tr( "&Save..." ), CTRL + Key_S, this, "fileSave" );
1.85 + a = new QAction( tr( "Save" ), QPixmap( iconPath+"filesave.png"), tr( "&Save..." ), CTRL + Key_S, this, "fileSave" );
1.86 connect( a, SIGNAL( activated() ), this, SLOT( fileSave() ) );
1.87 a->addTo( tb );
1.88 a->addTo( menu );
1.89 actionFileSave=a;
1.90
1.91 - a = new QAction( tr( "Save &As" ), QPixmap(), tr( "Save &As..." ), 0, this, "fileSaveAs" );
1.92 + a = new QAction( tr( "Save &As" ), QPixmap(iconPath+"filesaveas.png"), tr( "Save &As..." ), 0, this, "fileSaveAs" );
1.93 connect( a, SIGNAL( activated() ), this, SLOT( fileSaveAs() ) );
1.94 a->addTo( menu );
1.95
1.96 @@ -411,17 +370,17 @@
1.97 menu->insertSeparator();
1.98
1.99
1.100 - a = new QAction( tr( "Print" ), QPixmap( fileprint_xpm ), tr( "&Print")+QString("..."), CTRL + Key_P, this, "filePrint" );
1.101 + a = new QAction( tr( "Print" ), QPixmap( iconPath+"fileprint.png"), tr( "&Print")+QString("..."), CTRL + Key_P, this, "filePrint" );
1.102 connect( a, SIGNAL( activated() ), this, SLOT( filePrint() ) );
1.103 a->addTo( tb );
1.104 a->addTo( menu );
1.105 actionFilePrint=a;
1.106
1.107 - a = new QAction( tr( "Close Map" ), QPixmap(), tr( "&Close Map" ), ALT + Key_C, this, "fileCloseMap" );
1.108 + a = new QAction( tr( "Close Map" ), QPixmap(iconPath+"fileclose.png"), tr( "&Close Map" ), ALT + Key_C, this, "fileCloseMap" );
1.109 connect( a, SIGNAL( activated() ), this, SLOT( fileCloseMap() ) );
1.110 a->addTo( menu );
1.111
1.112 - a = new QAction( tr( "Exit")+" "+__VYM, QPixmap(), tr( "E&xit")+" "+__VYM, CTRL + Key_Q, this, "fileExitVYM" );
1.113 + a = new QAction( tr( "Exit")+" "+__VYM, QPixmap(iconPath+"exit.png"), tr( "E&xit")+" "+__VYM, CTRL + Key_Q, this, "fileExitVYM" );
1.114 connect( a, SIGNAL( activated() ), this, SLOT( fileExitVYM() ) );
1.115 a->addTo( menu );
1.116 }
1.117 @@ -437,7 +396,7 @@
1.118
1.119 QAction *a;
1.120 QAction *alt;
1.121 - a = new QAction( tr( "Undo" ), QPixmap( editundo_xpm ), tr( "&Undo" ), CTRL + Key_Z, this, "editUndo" );
1.122 + a = new QAction( tr( "Undo" ), QPixmap( iconPath+"undo.png"), tr( "&Undo" ), CTRL + Key_Z, this, "editUndo" );
1.123 connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) );
1.124 a->setEnabled (false);
1.125 a->addTo( tb );
1.126 @@ -446,33 +405,33 @@
1.127
1.128 if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false))
1.129 {
1.130 - a = new QAction( tr( "Redo" ), QPixmap( editredo_xpm ), tr( "&Redo" ), CTRL + Key_Y, this, "editRedo" );
1.131 + a = new QAction( tr( "Redo" ), QPixmap( iconPath+"redo.png"), tr( "&Redo" ), CTRL + Key_Y, this, "editRedo" );
1.132 connect( a, SIGNAL( activated() ), this, SLOT( editRedo() ) );
1.133 a->addTo( tb );
1.134 a->addTo( menu );
1.135 }
1.136
1.137 menu->insertSeparator();
1.138 - a = new QAction( tr( "Copy" ), QPixmap( editcopy_xpm ), tr( "&Copy" ), CTRL + Key_C, this, "editCopy" );
1.139 + a = new QAction( tr( "Copy" ), QPixmap( iconPath+"editcopy.png"), tr( "&Copy" ), CTRL + Key_C, this, "editCopy" );
1.140 connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) );
1.141 a->setEnabled (false);
1.142 a->addTo( tb );
1.143 a->addTo( menu );
1.144 actionEditCopy=a;
1.145 - a = new QAction( tr( "Cut" ), QPixmap( editcut_xpm ), tr( "Cu&t" ), CTRL + Key_X, this, "editCut" );
1.146 + a = new QAction( tr( "Cut" ), QPixmap( iconPath+"editcut.png" ), tr( "Cu&t" ), CTRL + Key_X, this, "editCut" );
1.147 connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
1.148 a->setEnabled (false);
1.149 a->addTo( tb );
1.150 a->addTo( menu );
1.151 actionEditCut=a;
1.152 - a = new QAction( tr( "Paste" ), QPixmap( editpaste_xpm ), tr( "&Paste" ), CTRL + Key_V, this, "editPaste" );
1.153 + a = new QAction( tr( "Paste" ), QPixmap( iconPath+"editpaste.png"), tr( "&Paste" ), CTRL + Key_V, this, "editPaste" );
1.154 connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
1.155 a->setEnabled (false);
1.156 a->addTo( tb );
1.157 a->addTo( menu );
1.158 actionEditPaste=a;
1.159
1.160 - a = new QAction( tr( "Move branch up" ), QPixmap( editmoveup_xpm ), tr( "Move up" ), Key_PageUp, this, "editMoveUp" );
1.161 + a = new QAction( tr( "Move branch up" ), QPixmap(iconPath+"up.png" ), tr( "Move up" ), Key_PageUp, this, "editMoveUp" );
1.162 connect( a, SIGNAL( activated() ), this, SLOT( editMoveUp() ) );
1.163 a->setEnabled (false);
1.164 a->addTo( tb );
1.165 @@ -480,7 +439,7 @@
1.166 actionListBranches.append(a);
1.167 actionEditMoveUp=a;
1.168
1.169 - a = new QAction( tr( "Move branch down" ), QPixmap( editmovedown_xpm ), tr( "Move down" ), Key_PageDown, this, "editMoveDown" );
1.170 + a = new QAction( tr( "Move branch down" ), QPixmap( iconPath+"down.png"), tr( "Move down" ), Key_PageDown, this, "editMoveDown" );
1.171 connect( a, SIGNAL( activated() ), this, SLOT( editMoveDown() ) );
1.172 a->setEnabled (false);
1.173 a->addTo( tb );
1.174 @@ -489,9 +448,9 @@
1.175 actionEditMoveDown=a;
1.176
1.177
1.178 - a = new QAction( tr( "Scroll branch" ), QPixmap(flag_scrolled_right_xpm), tr( "Scroll branch" ), Key_ScrollLock, this, "scroll" );
1.179 + a = new QAction( tr( "Scroll branch" ), QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ), Key_ScrollLock, this, "scroll" );
1.180 connect( a, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
1.181 - alt = new QAction( tr( "Scroll branch" ), QPixmap(flag_scrolled_right_xpm), tr( "Scroll branch" ), Key_S, this, "scroll" );
1.182 + alt = new QAction( tr( "Scroll branch" ), QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ), Key_S, this, "scroll" );
1.183 connect( alt, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
1.184 #if defined(Q_OS_MACX)
1.185 actionEditToggleScroll=alt;
1.186 @@ -510,13 +469,13 @@
1.187
1.188 menu->insertSeparator();
1.189
1.190 - a = new QAction( tr( "Find" ), QPixmap(), tr( "Find"+QString("...") ), CTRL + Key_F, this, "find" );
1.191 + a = new QAction( tr( "Find" ), QPixmap(iconPath+"find.png"), tr( "Find"+QString("...") ), CTRL + Key_F, this, "find" );
1.192 connect( a, SIGNAL( activated() ), this, SLOT( editOpenFindWindow() ) );
1.193 a->addTo( menu );
1.194
1.195 menu->insertSeparator();
1.196
1.197 - a = new QAction( tr( "Open URL" ), QPixmap(flag_url_xpm), tr( "Open URL" ), CTRL + Key_U, this, "url" );
1.198 + a = new QAction( tr( "Open URL" ), QPixmap(flagsPath+"flag-url.png"), tr( "Open URL" ), CTRL + Key_U, this, "url" );
1.199 connect( a, SIGNAL( activated() ), this, SLOT( editOpenURL() ) );
1.200 a->addTo( tb );
1.201 a->setEnabled (false);
1.202 @@ -551,7 +510,7 @@
1.203 actionListBranches.append(a);
1.204 actionEditFATE2URL=a;
1.205
1.206 - a = new QAction( tr( "Jump to another vym map, if needed load it first" ), QPixmap(flag_vymlink_xpm), tr( "Jump to map" ), 0, this, "jumpMap" );
1.207 + a = new QAction( tr( "Jump to another vym map, if needed load it first" ), QPixmap(flagsPath+"flag-vymlink.png"), tr( "Jump to map" ), 0, this, "jumpMap" );
1.208 connect( a, SIGNAL( activated() ), this, SLOT( editOpenVymLink() ) );
1.209 a->addTo( tb );
1.210 a->setEnabled (false);
1.211 @@ -568,7 +527,7 @@
1.212 a->setEnabled (false);
1.213 actionEditDeleteVymLink=a;
1.214
1.215 - a = new QAction( tr( "Hide object in exports" ), QPixmap(flag_hideexport_xpm), tr( "Hide in exports" ), 0, this, "hideExport" );
1.216 + a = new QAction( tr( "Hide object in exports" ), QPixmap(flagsPath+"flag-hideexport.png"), tr( "Hide in exports" ), Key_H, this, "hideExport" );
1.217 connect( a, SIGNAL( activated() ), this, SLOT( editToggleHideExport() ) );
1.218 a->setToggleAction(true);
1.219 a->addTo( tb );
1.220 @@ -723,21 +682,21 @@
1.221 connect( actionFormatColor, SIGNAL( activated() ), this, SLOT( formatSelectColor() ) );
1.222 actionFormatColor->addTo( tb );
1.223 actionFormatColor->addTo( menu );
1.224 - a= new QAction( tr( "Pick color\nHint: You can pick a color from another branch and color using CTRL+Left Button" ), QPixmap(formatcolorpicker_xpm), tr( "Pic&k color" ), CTRL + Key_K, this, "pickColor" );
1.225 + a= new QAction( tr( "Pick color\nHint: You can pick a color from another branch and color using CTRL+Left Button" ), QPixmap(iconPath+"formatcolorpicker.png"), tr( "Pic&k color" ), CTRL + Key_K, this, "pickColor" );
1.226 connect( a, SIGNAL( activated() ), this, SLOT( formatPickColor() ) );
1.227 a->setEnabled (false);
1.228 a->addTo( tb );
1.229 a->addTo( menu );
1.230 actionListBranches.append(a);
1.231 actionFormatPickColor=a;
1.232 - a= new QAction( tr( "Color branch" ), QPixmap(formatcoloritem_xpm), tr( "Color &branch" ), CTRL + Key_I, this, "colorItem" );
1.233 + a= new QAction( tr( "Color branch" ), QPixmap(iconPath+"formatcoloritem.png"), tr( "Color &branch" ), CTRL + Key_I, this, "colorItem" );
1.234 connect( a, SIGNAL( activated() ), this, SLOT( formatColorItem() ) );
1.235 a->setEnabled (false);
1.236 a->addTo( tb );
1.237 a->addTo( menu );
1.238 actionListBranches.append(a);
1.239 actionFormatColorBranch=a;
1.240 - a= new QAction( tr( "Color Subtree" ), QPixmap(formatcolorbranch_xpm), tr( "Color sub&tree" ), CTRL + Key_T, this, "colorBranch" );
1.241 + a= new QAction( tr( "Color Subtree" ), QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color sub&tree" ), CTRL + Key_T, this, "colorBranch" );
1.242 connect( a, SIGNAL( activated() ), this, SLOT( formatColorBranch() ) );
1.243 a->setEnabled (false);
1.244 a->addTo( menu );
1.245 @@ -816,19 +775,19 @@
1.246 menuBar()->insertItem( tr( "&View" ), menu );
1.247
1.248 QAction *a;
1.249 - a = new QAction( tr( "Zoom reset" ), QPixmap(viewzoomreset_xpm), tr( "reset Zoom" ), CTRL + Key_0, this, "zoomReset" );
1.250 + a = new QAction( tr( "Zoom reset" ), QPixmap(iconPath+"viewmag-reset.png"), tr( "reset Zoom" ), CTRL + Key_0, this, "zoomReset" );
1.251 connect( a, SIGNAL( activated() ), this, SLOT(viewZoomReset() ) );
1.252 a->addTo( tb );
1.253 a->addTo( menu );
1.254 - a = new QAction( tr( "Zoom in" ), QPixmap(viewzoomin_xpm), tr( "Zoom in" ), CTRL + Key_Plus, this, "zoomIn" );
1.255 + a = new QAction( tr( "Zoom in" ), QPixmap(iconPath+"viewmag+.png"), tr( "Zoom in" ), CTRL + Key_Plus, this, "zoomIn" );
1.256 connect( a, SIGNAL( activated() ), this, SLOT(viewZoomIn() ) );
1.257 a->addTo( tb );
1.258 a->addTo( menu );
1.259 - a = new QAction( tr( "Zoom out" ), QPixmap(viewzoomout_xpm), tr( "Zoom out" ), CTRL + Key_Minus, this, "zoomOut" );
1.260 + a = new QAction( tr( "Zoom out" ), QPixmap(iconPath+"viewmag-.png"), tr( "Zoom out" ), CTRL + Key_Minus, this, "zoomOut" );
1.261 connect( a, SIGNAL( activated() ), this, SLOT( viewZoomOut() ) );
1.262 a->addTo( tb );
1.263 a->addTo( menu );
1.264 - a = new QAction( tr( "Toggle Note Editor" ), QPixmap(flag_note_xpm), tr( "Toggle Note Editor" ), CTRL + Key_E , this, "noteEditor" );
1.265 + a = new QAction( tr( "Toggle Note Editor" ), QPixmap(flagsPath+"flag-note.png"), tr( "Toggle Note Editor" ), CTRL + Key_E , this, "noteEditor" );
1.266 connect( a, SIGNAL( activated() ), this, SLOT(windowToggleNoteEditor() ) );
1.267 a->setToggleAction(true);
1.268 if (textEditor->showWithMain())
1.269 @@ -857,18 +816,18 @@
1.270 QAction *a;
1.271 actionGroupModModes=new QActionGroup ( this, "formatLinkStyles");
1.272 actionGroupModModes->setExclusive (true);
1.273 - a= new QAction( tr( "Use modifier to color branches" ), QPixmap(modecolor_xpm), 0, Key_J, actionGroupModModes, "modModeColor" );
1.274 + a= new QAction( tr( "Use modifier to color branches" ), QPixmap(iconPath+"modecolor.png"), 0, Key_J, actionGroupModModes, "modModeColor" );
1.275 a->setToggleAction(true);
1.276 a->addTo (tb);
1.277 a->setOn(true);
1.278 actionModModeColor=a;
1.279
1.280 - a= new QAction( tr( "Use modifier to copy" ), QPixmap(modecopy_xpm), 0, Key_K, actionGroupModModes, "modModeCopy" );
1.281 + a= new QAction( tr( "Use modifier to copy" ), QPixmap(iconPath+"modecopy.png"), 0, Key_K, actionGroupModModes, "modModeCopy" );
1.282 a->setToggleAction(true);
1.283 a->addTo (tb);
1.284 actionModModeCopy=a;
1.285
1.286 - a= new QAction( tr( "Use modifier to draw xLinks" ), QPixmap(modelink_xpm), 0, Key_L, actionGroupModModes, "modModeLink" );
1.287 + a= new QAction( tr( "Use modifier to draw xLinks" ), QPixmap(iconPath+"modelink.png"), 0, Key_L, actionGroupModModes, "modModeLink" );
1.288 a->setToggleAction(true);
1.289 a->addTo (tb);
1.290 actionModModeLink=a;
1.291 @@ -883,32 +842,32 @@
1.292 systemFlagsDefault->setName ("systemFlagsDef");
1.293
1.294 FlagObj *fo = new FlagObj ();
1.295 - fo->load(QPixmap(flag_note_xpm));
1.296 + fo->load(QPixmap(flagsPath+"flag-note.png"));
1.297 fo->setName("note");
1.298 fo->setToolTip(tr("Note","Systemflag"));
1.299 systemFlagsDefault->addFlag (fo); // makes deep copy
1.300
1.301 - fo->load(QPixmap(flag_url_xpm));
1.302 + fo->load(QPixmap(flagsPath+"flag-url.png"));
1.303 fo->setName("url");
1.304 fo->setToolTip(tr("WWW Document (external)","Systemflag"));
1.305 systemFlagsDefault->addFlag (fo);
1.306
1.307 - fo->load(QPixmap(flag_vymlink_xpm));
1.308 + fo->load(QPixmap(flagsPath+"flag-vymlink.png"));
1.309 fo->setName("vymLink");
1.310 fo->setToolTip(tr("Link to another vym map","Systemflag"));
1.311 systemFlagsDefault->addFlag (fo);
1.312
1.313 - fo->load(QPixmap(flag_scrolled_right_xpm));
1.314 + fo->load(QPixmap(flagsPath+"flag-scrolled-right.png"));
1.315 fo->setName("scrolledright");
1.316 fo->setToolTip(tr("subtree is scrolled","Systemflag"));
1.317 systemFlagsDefault->addFlag (fo);
1.318
1.319 - fo->load(QPixmap(flag_tmpUnscrolled_right_xpm));
1.320 + fo->load(QPixmap(flagsPath+"flag-tmpUnscrolled-right.png"));
1.321 fo->setName("tmpUnscrolledright");
1.322 fo->setToolTip(tr("subtree is temporary scrolled","Systemflag"));
1.323 systemFlagsDefault->addFlag (fo);
1.324
1.325 - fo->load(QPixmap("icons/flag-hideexport.png"));
1.326 + fo->load(QPixmap(flagsPath+"flag-hideexport.png"));
1.327 fo->setName("hideInExport");
1.328 fo->setToolTip(tr("Hide object in exported maps","Systemflag"));
1.329 systemFlagsDefault->addFlag (fo);
1.330 @@ -918,93 +877,134 @@
1.331 standardFlagsDefault->setVisibility (false);
1.332 standardFlagsDefault->setName ("standardFlagsDef");
1.333
1.334 - fo->load(QPixmap(flag_exclamationmark_xpm));
1.335 + fo->load(QPixmap(flagsPath+"flag-exclamationmark.png"));
1.336 fo->setName ("exclamationmark");
1.337 fo->setGroup("standard-mark");
1.338 fo->setToolTip(tr("Take care!","Standardflag"));
1.339 standardFlagsDefault->addFlag (fo); // makes deep copy
1.340
1.341 - fo->load(QPixmap(flag_questionmark_xpm));
1.342 + fo->load(QPixmap(flagsPath+"flag-questionmark.png"));
1.343 fo->setName("questionmark");
1.344 fo->setGroup("standard-mark");
1.345 fo->setToolTip(tr("Really?","Standardflag"));
1.346 standardFlagsDefault->addFlag (fo);
1.347
1.348 - fo->load(QPixmap(flag_hook_green_xpm));
1.349 + fo->load(QPixmap(flagsPath+"flag-hook-green.png"));
1.350 fo->setName("hook-green");
1.351 fo->setGroup("standard-hook");
1.352 fo->setToolTip(tr("ok!","Standardflag"));
1.353 standardFlagsDefault->addFlag (fo);
1.354
1.355 - fo->load(QPixmap(flag_cross_red_xpm));
1.356 + fo->load(QPixmap(flagsPath+"flag-cross-red.png"));
1.357 fo->setName("cross-red");
1.358 fo->setGroup("standard-hook");
1.359 fo->setToolTip(tr("Not ok!","Standardflag"));
1.360 standardFlagsDefault->addFlag (fo);
1.361
1.362 - fo->load(QPixmap(flag_stopsign_xpm));
1.363 + fo->load(QPixmap(flagsPath+"flag-stopsign.png"));
1.364 fo->setName("stopsign");
1.365 fo->setToolTip(tr("This won't work!","Standardflag"));
1.366 standardFlagsDefault->addFlag (fo);
1.367
1.368 - fo->load(QPixmap(flag_smiley_good_xpm));
1.369 + fo->load(QPixmap(flagsPath+"flag-smiley-good.png"));
1.370 fo->setName("smiley-good");
1.371 fo->setGroup("standard-smiley");
1.372 fo->setToolTip(tr("Good","Standardflag"));
1.373 standardFlagsDefault->addFlag (fo);
1.374
1.375 - fo->load(QPixmap(flag_smiley_sad_xpm));
1.376 + fo->load(QPixmap(flagsPath+"flag-smiley-sad.png"));
1.377 fo->setName("smiley-sad");
1.378 fo->setGroup("standard-smiley");
1.379 fo->setToolTip(tr("Bad","Standardflag"));
1.380 standardFlagsDefault->addFlag (fo);
1.381
1.382 - fo->load(QPixmap(flag_clock_xpm));
1.383 + fo->load(QPixmap(flagsPath+"flag-smiley-omg.png"));
1.384 + // Original omg.png (in KDE emoticons)
1.385 + fo->setName("smiley-omg");
1.386 + fo->setGroup("standard-smiley");
1.387 + fo->setToolTip(tr("Oh no!","Standardflag"));
1.388 + standardFlagsDefault->addFlag (fo);
1.389 +
1.390 + fo->load(QPixmap(flagsPath+"flag-kalarm.png"));
1.391 fo->setName("clock");
1.392 fo->setToolTip(tr("Time critical","Standardflag"));
1.393 standardFlagsDefault->addFlag (fo);
1.394
1.395 - fo->load(QPixmap(flag_lamp_xpm));
1.396 + fo->load(QPixmap(flagsPath+"flag-phone.png"));
1.397 + fo->setName("phone");
1.398 + fo->setToolTip(tr("Call...","Standardflag"));
1.399 + standardFlagsDefault->addFlag (fo);
1.400 +
1.401 + fo->load(QPixmap(flagsPath+"flag-lamp.png"));
1.402 fo->setName("lamp");
1.403 fo->setToolTip(tr("Idea!","Standardflag"));
1.404 standardFlagsDefault->addFlag (fo);
1.405
1.406 - fo->load(QPixmap(flag_arrow_up_xpm));
1.407 + fo->load(QPixmap(flagsPath+"flag-arrow-up.png"));
1.408 fo->setName("arrow-up");
1.409 fo->setGroup("standard-arrow");
1.410 fo->setToolTip(tr("Important","Standardflag"));
1.411 standardFlagsDefault->addFlag (fo);
1.412
1.413 - fo->load(QPixmap(flag_arrow_down_xpm));
1.414 + fo->load(QPixmap(flagsPath+"flag-arrow-down.png"));
1.415 fo->setName("arrow-down");
1.416 fo->setGroup("standard-arrow");
1.417 fo->setToolTip(tr("Unimportant","Standardflag"));
1.418 standardFlagsDefault->addFlag (fo);
1.419
1.420 - fo->load(QPixmap(flag_thumb_up_xpm));
1.421 + fo->load(QPixmap(flagsPath+"flag-arrow-2up.png"));
1.422 + fo->setName("2arrow-up");
1.423 + fo->setGroup("standard-arrow");
1.424 + fo->setToolTip(tr("Very important!","Standardflag"));
1.425 + standardFlagsDefault->addFlag (fo);
1.426 +
1.427 + fo->load(QPixmap(flagsPath+"flag-arrow-2down.png"));
1.428 + fo->setName("2arrow-down");
1.429 + fo->setGroup("standard-arrow");
1.430 + fo->setToolTip(tr("Very unimportant!","Standardflag"));
1.431 + standardFlagsDefault->addFlag (fo);
1.432 +
1.433 + fo->load(QPixmap(flagsPath+"flag-thumb-up.png"));
1.434 fo->setName("thumb-up");
1.435 fo->setGroup("standard-thumb");
1.436 fo->setToolTip(tr("I like this","Standardflag"));
1.437 standardFlagsDefault->addFlag (fo);
1.438
1.439 - fo->load(QPixmap(flag_thumb_down_xpm));
1.440 + fo->load(QPixmap(flagsPath+"flag-thumb-down.png"));
1.441 fo->setName("thumb-down");
1.442 fo->setGroup("standard-thumb");
1.443 fo->setToolTip(tr("I like this","Standardflag"));
1.444 fo->setToolTip(tr("I do not like this","Standardflag"));
1.445 standardFlagsDefault->addFlag (fo);
1.446
1.447 - fo->load(QPixmap(flag_heart_xpm));
1.448 + fo->load(QPixmap(flagsPath+"flag-rose.png"));
1.449 + fo->setName("rose");
1.450 + fo->setToolTip(tr("Rose","Standardflag"));
1.451 + standardFlagsDefault->addFlag (fo);
1.452 +
1.453 + fo->load(QPixmap(flagsPath+"flag-heart.png"));
1.454 fo->setName("heart");
1.455 fo->setToolTip(tr("I just love... ","Standardflag"));
1.456 standardFlagsDefault->addFlag (fo);
1.457
1.458 - fo->load(QPixmap(flag_flash_xpm));
1.459 + fo->load(QPixmap(flagsPath+"flag-present.png"));
1.460 + fo->setName("present");
1.461 + fo->setToolTip(tr("Surprise!","Standardflag"));
1.462 + standardFlagsDefault->addFlag (fo);
1.463 +
1.464 + fo->load(QPixmap(flagsPath+"flag-flash.png"));
1.465 fo->setName("flash");
1.466 fo->setToolTip(tr("Dangerous","Standardflag"));
1.467 standardFlagsDefault->addFlag (fo);
1.468
1.469 - fo->load(QPixmap(flag_lifebelt_xpm));
1.470 + fo->load(QPixmap(flagsPath+"flag-info.png"));
1.471 + // Original: xsldbg_output.png
1.472 + fo->setName("info");
1.473 + fo->setToolTip(tr("Info","Standardflag"));
1.474 + standardFlagsDefault->addFlag (fo);
1.475 +
1.476 + fo->load(QPixmap(flagsPath+"flag-lifebelt.png"));
1.477 + // Original khelpcenter.png
1.478 fo->setName("lifebelt");
1.479 fo->setToolTip(tr("This will help","Standardflag"));
1.480 standardFlagsDefault->addFlag (fo);
1.481 @@ -1235,14 +1235,6 @@
1.482 connect( a, SIGNAL( activated() ), this, SLOT( fileExportXML() ) );
1.483 a->addTo( exportMenu );
1.484
1.485 - if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false))
1.486 - {
1.487 - a = new QAction( tr( "Export as")+" HTML" , QPixmap(), "HTML...", 0, this, "exportHTML");
1.488 - connect( a, SIGNAL( activated() ), this, SLOT( fileExportHTML() ) );
1.489 - a->addTo( exportMenu );
1.490 - }
1.491 -
1.492 -
1.493 // Context menu for canvas
1.494 canvasContextMenu =new QPopupMenu (this);
1.495 actionEditMapInfo->addTo( canvasContextMenu );
1.496 @@ -1878,26 +1870,6 @@
1.497 }
1.498 }
1.499
1.500 -void Main::fileExportHTML()
1.501 -{
1.502 - MapEditor *me=currentMapEditor();
1.503 - if (me)
1.504 - {
1.505 - ExportHTMLDialog dia(this);
1.506 -
1.507 - if (dia.exec()==QDialog::Accepted)
1.508 - {
1.509 - QString dir=dia.getDir();
1.510 - if (reallyWriteDirectory(dir) )
1.511 - {
1.512 - me->setExportMode (true);
1.513 - me->exportXML (dia.getDir() );
1.514 - dia.doExport(me->getMapName() );
1.515 - me->setExportMode (false);
1.516 - }
1.517 - }
1.518 - }
1.519 -}
1.520
1.521 void Main::fileExportXHTML()
1.522 {