# HG changeset patch
# User insilmaril
# Date 1144666823 0
# Node ID 4c3e9fa0093b9b87b19ff1957459b4bfa9378772
# Parent 2a6157d381fe87d90a403ea41e944c083b582b9e
switching to KDE icons
diff -r 2a6157d381fe -r 4c3e9fa0093b demos/time-management.vym
Binary file demos/time-management.vym has changed
diff -r 2a6157d381fe -r 4c3e9fa0093b demos/todo.vym
Binary file demos/todo.vym has changed
diff -r 2a6157d381fe -r 4c3e9fa0093b main.cpp
--- a/main.cpp Mon Apr 10 11:00:19 2006 +0000
+++ b/main.cpp Mon Apr 10 11:00:23 2006 +0000
@@ -11,10 +11,6 @@
#include "options.h"
#include "mainwindow.h"
-#include "icons/vym-48x48.xpm"
-#include "icons/vym-128x128.xpm"
-#include "icons/vym-editor.xpm"
-
#include "flagrowobj.h"
// Global variables
@@ -25,6 +21,8 @@
QString tmpVymDir; // All temp files go there, created in mainwindow
QString clipboardDir; // Clipboard used in all mapEditors
QDir vymBaseDir; // Containing all styles, scripts, images, ...
+QString iconPath; // Pointing to icons used for toolbars
+QString flagsPath; // Pointing to flags
bool clipboardEmpty;
FlagRowObj *systemFlagsDefault; // used to copy from in LinkableMapObj
FlagRowObj *standardFlagsDefault;
@@ -160,10 +158,18 @@
// Use /usr/share/vym or /usr/local/share/vym or . ?
QDir vymBaseDir;
+
+ // First try options
if (options.isOn ("local"))
{
vymBaseDir.setPath (vymBaseDir.currentDirPath());
- }else
+ } else
+ // then look for environment variable
+ if (getenv("VYMHOME")!=0)
+ {
+ vymBaseDir.setPath (getenv("VYMHOME"));
+ } else
+ // ok, let's find my way on my own
{
vymBaseDir.setPath ("/usr/share/vym");
if (!vymBaseDir.exists())
@@ -172,6 +178,9 @@
vymBaseDir.setPath(vymBaseDir.currentDirPath() );
}
+ iconPath=vymBaseDir.path()+"/icons/";
+ flagsPath=vymBaseDir.path()+"/flags/";
+
if (options.isOn ("help"))
{
cout << options.getHelpText()<<endl;
@@ -186,7 +195,7 @@
QMimeSourceFactory *factory = QMimeSourceFactory::defaultFactory();
- factory->setPixmap("vym_128x128", QPixmap(vym_128x128_xpm));
+ factory->setPixmap("vym-128x128", QPixmap(iconPath+"vym-128x128.png"));
qInitNetworkProtocols();
@@ -203,13 +212,13 @@
// Initialize window of TextEditor
textEditor = new TextEditor();
- textEditor->setIcon (QPixmap (vym_editor_xpm));
+ textEditor->setIcon (QPixmap (iconPath+"vym-editor.png"));
if (textEditor->showWithMain()) textEditor->show();
// Initialize mainwindow
Main m;
//m.resize(m.sizeHint());
- m.setIcon (QPixmap (vym_48x48_xpm));
+ m.setIcon (QPixmap (iconPath+"vym-48x48.png"));
m.show();
m.fileNew();
m.loadCmdLine();
diff -r 2a6157d381fe -r 4c3e9fa0093b mainwindow.cpp
--- a/mainwindow.cpp Mon Apr 10 11:00:19 2006 +0000
+++ b/mainwindow.cpp Mon Apr 10 11:00:23 2006 +0000
@@ -19,51 +19,7 @@
#include <cstdlib>
#include <typeinfo>
-#include "icons/filenew.xpm"
-#include "icons/fileopen.xpm"
-#include "icons/filesave.xpm"
-#include "icons/fileprint.xpm"
-#include "icons/editundo.xpm"
-#include "icons/editredo.xpm"
-#include "icons/editcopy.xpm"
-#include "icons/editcut.xpm"
-#include "icons/editpaste.xpm"
-#include "icons/editmoveup.xpm"
-#include "icons/editmovedown.xpm"
-#include "icons/formatcoloritem.xpm"
-#include "icons/formatcolorbranch.xpm"
-#include "icons/formatcolorpicker.xpm"
-#include "icons/viewzoomreset.xpm"
-#include "icons/viewzoomin.xpm"
-#include "icons/viewzoomout.xpm"
-#include "icons/modecolor.xpm"
-#include "icons/modelink.xpm"
-#include "icons/modecopy.xpm"
-#include "icons/flag-questionmark.xpm"
-#include "icons/flag-exclamationmark.xpm"
-#include "icons/flag-hook-green.xpm"
-#include "icons/flag-cross-red.xpm"
-#include "icons/flag-stopsign.xpm"
-#include "icons/flag-smiley-good.xpm"
-#include "icons/flag-smiley-sad.xpm"
-#include "icons/flag-clock.xpm"
-#include "icons/flag-lamp.xpm"
-#include "icons/flag-arrow-up.xpm"
-#include "icons/flag-arrow-down.xpm"
-#include "icons/flag-thumb-up.xpm"
-#include "icons/flag-thumb-down.xpm"
-#include "icons/flag-heart.xpm"
-#include "icons/flag-flash.xpm"
-#include "icons/flag-lifebelt.xpm"
-#include "icons/flag-note.xpm"
-#include "icons/flag-url.xpm"
-#include "icons/flag-vymlink.xpm"
-#include "icons/flag-hideexport.xpm"
-#include "icons/flag-scrolled-right.xpm"
-#include "icons/flag-tmpUnscrolled-right.xpm"
-
#include "aboutdialog.h"
-#include "exporthtmldialog.h"
#include "exportoofiledialog.h"
#include "exports.h"
#include "exportxhtmldialog.h"
@@ -179,6 +135,9 @@
extern Settings settings;
extern Options options;
+extern QDir vymBaseDir;
+extern QString iconPath;
+extern QString flagsPath;
#if defined(Q_OS_LINUX)
extern void qt_wait_for_window_manager( QWidget* w );
@@ -363,12 +322,12 @@
// Keycodes: /usr/lib64/qt3/include/qnamespace.h
QAction *a;
- a = new QAction( tr( "New map","File menu" ), QPixmap( filenew_xpm ), tr( "&New..." ), CTRL + Key_N, this, "fileNew" );
+ a = new QAction( tr( "New map","File menu" ), QPixmap( iconPath+"filenew.png"), tr( "&New..." ), CTRL + Key_N, this, "fileNew" );
connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
a->addTo( tb );
a->addTo( menu );
- a = new QAction( tr( "Open","File menu" ), QPixmap( fileopen_xpm), tr( "&Open..." ), CTRL + Key_O, this, "fileOpen" );
+ a = new QAction( tr( "Open","File menu" ), QPixmap( iconPath+"fileopen.png"), tr( "&Open..." ), CTRL + Key_O, this, "fileOpen" );
connect( a, SIGNAL( activated() ), this, SLOT( fileLoad() ) );
a->addTo( tb );
a->addTo( menu );
@@ -378,13 +337,13 @@
menu->insertItem (tr("Open Recent"),lastMapsMenu );
menu->insertSeparator();
- a = new QAction( tr( "Save" ), QPixmap( filesave_xpm ), tr( "&Save..." ), CTRL + Key_S, this, "fileSave" );
+ a = new QAction( tr( "Save" ), QPixmap( iconPath+"filesave.png"), tr( "&Save..." ), CTRL + Key_S, this, "fileSave" );
connect( a, SIGNAL( activated() ), this, SLOT( fileSave() ) );
a->addTo( tb );
a->addTo( menu );
actionFileSave=a;
- a = new QAction( tr( "Save &As" ), QPixmap(), tr( "Save &As..." ), 0, this, "fileSaveAs" );
+ a = new QAction( tr( "Save &As" ), QPixmap(iconPath+"filesaveas.png"), tr( "Save &As..." ), 0, this, "fileSaveAs" );
connect( a, SIGNAL( activated() ), this, SLOT( fileSaveAs() ) );
a->addTo( menu );
@@ -411,17 +370,17 @@
menu->insertSeparator();
- a = new QAction( tr( "Print" ), QPixmap( fileprint_xpm ), tr( "&Print")+QString("..."), CTRL + Key_P, this, "filePrint" );
+ a = new QAction( tr( "Print" ), QPixmap( iconPath+"fileprint.png"), tr( "&Print")+QString("..."), CTRL + Key_P, this, "filePrint" );
connect( a, SIGNAL( activated() ), this, SLOT( filePrint() ) );
a->addTo( tb );
a->addTo( menu );
actionFilePrint=a;
- a = new QAction( tr( "Close Map" ), QPixmap(), tr( "&Close Map" ), ALT + Key_C, this, "fileCloseMap" );
+ a = new QAction( tr( "Close Map" ), QPixmap(iconPath+"fileclose.png"), tr( "&Close Map" ), ALT + Key_C, this, "fileCloseMap" );
connect( a, SIGNAL( activated() ), this, SLOT( fileCloseMap() ) );
a->addTo( menu );
- a = new QAction( tr( "Exit")+" "+__VYM, QPixmap(), tr( "E&xit")+" "+__VYM, CTRL + Key_Q, this, "fileExitVYM" );
+ a = new QAction( tr( "Exit")+" "+__VYM, QPixmap(iconPath+"exit.png"), tr( "E&xit")+" "+__VYM, CTRL + Key_Q, this, "fileExitVYM" );
connect( a, SIGNAL( activated() ), this, SLOT( fileExitVYM() ) );
a->addTo( menu );
}
@@ -437,7 +396,7 @@
QAction *a;
QAction *alt;
- a = new QAction( tr( "Undo" ), QPixmap( editundo_xpm ), tr( "&Undo" ), CTRL + Key_Z, this, "editUndo" );
+ a = new QAction( tr( "Undo" ), QPixmap( iconPath+"undo.png"), tr( "&Undo" ), CTRL + Key_Z, this, "editUndo" );
connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) );
a->setEnabled (false);
a->addTo( tb );
@@ -446,33 +405,33 @@
if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false))
{
- a = new QAction( tr( "Redo" ), QPixmap( editredo_xpm ), tr( "&Redo" ), CTRL + Key_Y, this, "editRedo" );
+ a = new QAction( tr( "Redo" ), QPixmap( iconPath+"redo.png"), tr( "&Redo" ), CTRL + Key_Y, this, "editRedo" );
connect( a, SIGNAL( activated() ), this, SLOT( editRedo() ) );
a->addTo( tb );
a->addTo( menu );
}
menu->insertSeparator();
- a = new QAction( tr( "Copy" ), QPixmap( editcopy_xpm ), tr( "&Copy" ), CTRL + Key_C, this, "editCopy" );
+ a = new QAction( tr( "Copy" ), QPixmap( iconPath+"editcopy.png"), tr( "&Copy" ), CTRL + Key_C, this, "editCopy" );
connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) );
a->setEnabled (false);
a->addTo( tb );
a->addTo( menu );
actionEditCopy=a;
- a = new QAction( tr( "Cut" ), QPixmap( editcut_xpm ), tr( "Cu&t" ), CTRL + Key_X, this, "editCut" );
+ a = new QAction( tr( "Cut" ), QPixmap( iconPath+"editcut.png" ), tr( "Cu&t" ), CTRL + Key_X, this, "editCut" );
connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
a->setEnabled (false);
a->addTo( tb );
a->addTo( menu );
actionEditCut=a;
- a = new QAction( tr( "Paste" ), QPixmap( editpaste_xpm ), tr( "&Paste" ), CTRL + Key_V, this, "editPaste" );
+ a = new QAction( tr( "Paste" ), QPixmap( iconPath+"editpaste.png"), tr( "&Paste" ), CTRL + Key_V, this, "editPaste" );
connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
a->setEnabled (false);
a->addTo( tb );
a->addTo( menu );
actionEditPaste=a;
- a = new QAction( tr( "Move branch up" ), QPixmap( editmoveup_xpm ), tr( "Move up" ), Key_PageUp, this, "editMoveUp" );
+ a = new QAction( tr( "Move branch up" ), QPixmap(iconPath+"up.png" ), tr( "Move up" ), Key_PageUp, this, "editMoveUp" );
connect( a, SIGNAL( activated() ), this, SLOT( editMoveUp() ) );
a->setEnabled (false);
a->addTo( tb );
@@ -480,7 +439,7 @@
actionListBranches.append(a);
actionEditMoveUp=a;
- a = new QAction( tr( "Move branch down" ), QPixmap( editmovedown_xpm ), tr( "Move down" ), Key_PageDown, this, "editMoveDown" );
+ a = new QAction( tr( "Move branch down" ), QPixmap( iconPath+"down.png"), tr( "Move down" ), Key_PageDown, this, "editMoveDown" );
connect( a, SIGNAL( activated() ), this, SLOT( editMoveDown() ) );
a->setEnabled (false);
a->addTo( tb );
@@ -489,9 +448,9 @@
actionEditMoveDown=a;
- a = new QAction( tr( "Scroll branch" ), QPixmap(flag_scrolled_right_xpm), tr( "Scroll branch" ), Key_ScrollLock, this, "scroll" );
+ a = new QAction( tr( "Scroll branch" ), QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ), Key_ScrollLock, this, "scroll" );
connect( a, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
- alt = new QAction( tr( "Scroll branch" ), QPixmap(flag_scrolled_right_xpm), tr( "Scroll branch" ), Key_S, this, "scroll" );
+ alt = new QAction( tr( "Scroll branch" ), QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ), Key_S, this, "scroll" );
connect( alt, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
#if defined(Q_OS_MACX)
actionEditToggleScroll=alt;
@@ -510,13 +469,13 @@
menu->insertSeparator();
- a = new QAction( tr( "Find" ), QPixmap(), tr( "Find"+QString("...") ), CTRL + Key_F, this, "find" );
+ a = new QAction( tr( "Find" ), QPixmap(iconPath+"find.png"), tr( "Find"+QString("...") ), CTRL + Key_F, this, "find" );
connect( a, SIGNAL( activated() ), this, SLOT( editOpenFindWindow() ) );
a->addTo( menu );
menu->insertSeparator();
- a = new QAction( tr( "Open URL" ), QPixmap(flag_url_xpm), tr( "Open URL" ), CTRL + Key_U, this, "url" );
+ a = new QAction( tr( "Open URL" ), QPixmap(flagsPath+"flag-url.png"), tr( "Open URL" ), CTRL + Key_U, this, "url" );
connect( a, SIGNAL( activated() ), this, SLOT( editOpenURL() ) );
a->addTo( tb );
a->setEnabled (false);
@@ -551,7 +510,7 @@
actionListBranches.append(a);
actionEditFATE2URL=a;
- 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" );
+ 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" );
connect( a, SIGNAL( activated() ), this, SLOT( editOpenVymLink() ) );
a->addTo( tb );
a->setEnabled (false);
@@ -568,7 +527,7 @@
a->setEnabled (false);
actionEditDeleteVymLink=a;
- a = new QAction( tr( "Hide object in exports" ), QPixmap(flag_hideexport_xpm), tr( "Hide in exports" ), 0, this, "hideExport" );
+ a = new QAction( tr( "Hide object in exports" ), QPixmap(flagsPath+"flag-hideexport.png"), tr( "Hide in exports" ), Key_H, this, "hideExport" );
connect( a, SIGNAL( activated() ), this, SLOT( editToggleHideExport() ) );
a->setToggleAction(true);
a->addTo( tb );
@@ -723,21 +682,21 @@
connect( actionFormatColor, SIGNAL( activated() ), this, SLOT( formatSelectColor() ) );
actionFormatColor->addTo( tb );
actionFormatColor->addTo( menu );
- 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" );
+ 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" );
connect( a, SIGNAL( activated() ), this, SLOT( formatPickColor() ) );
a->setEnabled (false);
a->addTo( tb );
a->addTo( menu );
actionListBranches.append(a);
actionFormatPickColor=a;
- a= new QAction( tr( "Color branch" ), QPixmap(formatcoloritem_xpm), tr( "Color &branch" ), CTRL + Key_I, this, "colorItem" );
+ a= new QAction( tr( "Color branch" ), QPixmap(iconPath+"formatcoloritem.png"), tr( "Color &branch" ), CTRL + Key_I, this, "colorItem" );
connect( a, SIGNAL( activated() ), this, SLOT( formatColorItem() ) );
a->setEnabled (false);
a->addTo( tb );
a->addTo( menu );
actionListBranches.append(a);
actionFormatColorBranch=a;
- a= new QAction( tr( "Color Subtree" ), QPixmap(formatcolorbranch_xpm), tr( "Color sub&tree" ), CTRL + Key_T, this, "colorBranch" );
+ a= new QAction( tr( "Color Subtree" ), QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color sub&tree" ), CTRL + Key_T, this, "colorBranch" );
connect( a, SIGNAL( activated() ), this, SLOT( formatColorBranch() ) );
a->setEnabled (false);
a->addTo( menu );
@@ -816,19 +775,19 @@
menuBar()->insertItem( tr( "&View" ), menu );
QAction *a;
- a = new QAction( tr( "Zoom reset" ), QPixmap(viewzoomreset_xpm), tr( "reset Zoom" ), CTRL + Key_0, this, "zoomReset" );
+ a = new QAction( tr( "Zoom reset" ), QPixmap(iconPath+"viewmag-reset.png"), tr( "reset Zoom" ), CTRL + Key_0, this, "zoomReset" );
connect( a, SIGNAL( activated() ), this, SLOT(viewZoomReset() ) );
a->addTo( tb );
a->addTo( menu );
- a = new QAction( tr( "Zoom in" ), QPixmap(viewzoomin_xpm), tr( "Zoom in" ), CTRL + Key_Plus, this, "zoomIn" );
+ a = new QAction( tr( "Zoom in" ), QPixmap(iconPath+"viewmag+.png"), tr( "Zoom in" ), CTRL + Key_Plus, this, "zoomIn" );
connect( a, SIGNAL( activated() ), this, SLOT(viewZoomIn() ) );
a->addTo( tb );
a->addTo( menu );
- a = new QAction( tr( "Zoom out" ), QPixmap(viewzoomout_xpm), tr( "Zoom out" ), CTRL + Key_Minus, this, "zoomOut" );
+ a = new QAction( tr( "Zoom out" ), QPixmap(iconPath+"viewmag-.png"), tr( "Zoom out" ), CTRL + Key_Minus, this, "zoomOut" );
connect( a, SIGNAL( activated() ), this, SLOT( viewZoomOut() ) );
a->addTo( tb );
a->addTo( menu );
- a = new QAction( tr( "Toggle Note Editor" ), QPixmap(flag_note_xpm), tr( "Toggle Note Editor" ), CTRL + Key_E , this, "noteEditor" );
+ a = new QAction( tr( "Toggle Note Editor" ), QPixmap(flagsPath+"flag-note.png"), tr( "Toggle Note Editor" ), CTRL + Key_E , this, "noteEditor" );
connect( a, SIGNAL( activated() ), this, SLOT(windowToggleNoteEditor() ) );
a->setToggleAction(true);
if (textEditor->showWithMain())
@@ -857,18 +816,18 @@
QAction *a;
actionGroupModModes=new QActionGroup ( this, "formatLinkStyles");
actionGroupModModes->setExclusive (true);
- a= new QAction( tr( "Use modifier to color branches" ), QPixmap(modecolor_xpm), 0, Key_J, actionGroupModModes, "modModeColor" );
+ a= new QAction( tr( "Use modifier to color branches" ), QPixmap(iconPath+"modecolor.png"), 0, Key_J, actionGroupModModes, "modModeColor" );
a->setToggleAction(true);
a->addTo (tb);
a->setOn(true);
actionModModeColor=a;
- a= new QAction( tr( "Use modifier to copy" ), QPixmap(modecopy_xpm), 0, Key_K, actionGroupModModes, "modModeCopy" );
+ a= new QAction( tr( "Use modifier to copy" ), QPixmap(iconPath+"modecopy.png"), 0, Key_K, actionGroupModModes, "modModeCopy" );
a->setToggleAction(true);
a->addTo (tb);
actionModModeCopy=a;
- a= new QAction( tr( "Use modifier to draw xLinks" ), QPixmap(modelink_xpm), 0, Key_L, actionGroupModModes, "modModeLink" );
+ a= new QAction( tr( "Use modifier to draw xLinks" ), QPixmap(iconPath+"modelink.png"), 0, Key_L, actionGroupModModes, "modModeLink" );
a->setToggleAction(true);
a->addTo (tb);
actionModModeLink=a;
@@ -883,32 +842,32 @@
systemFlagsDefault->setName ("systemFlagsDef");
FlagObj *fo = new FlagObj ();
- fo->load(QPixmap(flag_note_xpm));
+ fo->load(QPixmap(flagsPath+"flag-note.png"));
fo->setName("note");
fo->setToolTip(tr("Note","Systemflag"));
systemFlagsDefault->addFlag (fo); // makes deep copy
- fo->load(QPixmap(flag_url_xpm));
+ fo->load(QPixmap(flagsPath+"flag-url.png"));
fo->setName("url");
fo->setToolTip(tr("WWW Document (external)","Systemflag"));
systemFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_vymlink_xpm));
+ fo->load(QPixmap(flagsPath+"flag-vymlink.png"));
fo->setName("vymLink");
fo->setToolTip(tr("Link to another vym map","Systemflag"));
systemFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_scrolled_right_xpm));
+ fo->load(QPixmap(flagsPath+"flag-scrolled-right.png"));
fo->setName("scrolledright");
fo->setToolTip(tr("subtree is scrolled","Systemflag"));
systemFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_tmpUnscrolled_right_xpm));
+ fo->load(QPixmap(flagsPath+"flag-tmpUnscrolled-right.png"));
fo->setName("tmpUnscrolledright");
fo->setToolTip(tr("subtree is temporary scrolled","Systemflag"));
systemFlagsDefault->addFlag (fo);
- fo->load(QPixmap("icons/flag-hideexport.png"));
+ fo->load(QPixmap(flagsPath+"flag-hideexport.png"));
fo->setName("hideInExport");
fo->setToolTip(tr("Hide object in exported maps","Systemflag"));
systemFlagsDefault->addFlag (fo);
@@ -918,93 +877,134 @@
standardFlagsDefault->setVisibility (false);
standardFlagsDefault->setName ("standardFlagsDef");
- fo->load(QPixmap(flag_exclamationmark_xpm));
+ fo->load(QPixmap(flagsPath+"flag-exclamationmark.png"));
fo->setName ("exclamationmark");
fo->setGroup("standard-mark");
fo->setToolTip(tr("Take care!","Standardflag"));
standardFlagsDefault->addFlag (fo); // makes deep copy
- fo->load(QPixmap(flag_questionmark_xpm));
+ fo->load(QPixmap(flagsPath+"flag-questionmark.png"));
fo->setName("questionmark");
fo->setGroup("standard-mark");
fo->setToolTip(tr("Really?","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_hook_green_xpm));
+ fo->load(QPixmap(flagsPath+"flag-hook-green.png"));
fo->setName("hook-green");
fo->setGroup("standard-hook");
fo->setToolTip(tr("ok!","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_cross_red_xpm));
+ fo->load(QPixmap(flagsPath+"flag-cross-red.png"));
fo->setName("cross-red");
fo->setGroup("standard-hook");
fo->setToolTip(tr("Not ok!","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_stopsign_xpm));
+ fo->load(QPixmap(flagsPath+"flag-stopsign.png"));
fo->setName("stopsign");
fo->setToolTip(tr("This won't work!","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_smiley_good_xpm));
+ fo->load(QPixmap(flagsPath+"flag-smiley-good.png"));
fo->setName("smiley-good");
fo->setGroup("standard-smiley");
fo->setToolTip(tr("Good","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_smiley_sad_xpm));
+ fo->load(QPixmap(flagsPath+"flag-smiley-sad.png"));
fo->setName("smiley-sad");
fo->setGroup("standard-smiley");
fo->setToolTip(tr("Bad","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_clock_xpm));
+ fo->load(QPixmap(flagsPath+"flag-smiley-omg.png"));
+ // Original omg.png (in KDE emoticons)
+ fo->setName("smiley-omg");
+ fo->setGroup("standard-smiley");
+ fo->setToolTip(tr("Oh no!","Standardflag"));
+ standardFlagsDefault->addFlag (fo);
+
+ fo->load(QPixmap(flagsPath+"flag-kalarm.png"));
fo->setName("clock");
fo->setToolTip(tr("Time critical","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_lamp_xpm));
+ fo->load(QPixmap(flagsPath+"flag-phone.png"));
+ fo->setName("phone");
+ fo->setToolTip(tr("Call...","Standardflag"));
+ standardFlagsDefault->addFlag (fo);
+
+ fo->load(QPixmap(flagsPath+"flag-lamp.png"));
fo->setName("lamp");
fo->setToolTip(tr("Idea!","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_arrow_up_xpm));
+ fo->load(QPixmap(flagsPath+"flag-arrow-up.png"));
fo->setName("arrow-up");
fo->setGroup("standard-arrow");
fo->setToolTip(tr("Important","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_arrow_down_xpm));
+ fo->load(QPixmap(flagsPath+"flag-arrow-down.png"));
fo->setName("arrow-down");
fo->setGroup("standard-arrow");
fo->setToolTip(tr("Unimportant","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_thumb_up_xpm));
+ fo->load(QPixmap(flagsPath+"flag-arrow-2up.png"));
+ fo->setName("2arrow-up");
+ fo->setGroup("standard-arrow");
+ fo->setToolTip(tr("Very important!","Standardflag"));
+ standardFlagsDefault->addFlag (fo);
+
+ fo->load(QPixmap(flagsPath+"flag-arrow-2down.png"));
+ fo->setName("2arrow-down");
+ fo->setGroup("standard-arrow");
+ fo->setToolTip(tr("Very unimportant!","Standardflag"));
+ standardFlagsDefault->addFlag (fo);
+
+ fo->load(QPixmap(flagsPath+"flag-thumb-up.png"));
fo->setName("thumb-up");
fo->setGroup("standard-thumb");
fo->setToolTip(tr("I like this","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_thumb_down_xpm));
+ fo->load(QPixmap(flagsPath+"flag-thumb-down.png"));
fo->setName("thumb-down");
fo->setGroup("standard-thumb");
fo->setToolTip(tr("I like this","Standardflag"));
fo->setToolTip(tr("I do not like this","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_heart_xpm));
+ fo->load(QPixmap(flagsPath+"flag-rose.png"));
+ fo->setName("rose");
+ fo->setToolTip(tr("Rose","Standardflag"));
+ standardFlagsDefault->addFlag (fo);
+
+ fo->load(QPixmap(flagsPath+"flag-heart.png"));
fo->setName("heart");
fo->setToolTip(tr("I just love... ","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_flash_xpm));
+ fo->load(QPixmap(flagsPath+"flag-present.png"));
+ fo->setName("present");
+ fo->setToolTip(tr("Surprise!","Standardflag"));
+ standardFlagsDefault->addFlag (fo);
+
+ fo->load(QPixmap(flagsPath+"flag-flash.png"));
fo->setName("flash");
fo->setToolTip(tr("Dangerous","Standardflag"));
standardFlagsDefault->addFlag (fo);
- fo->load(QPixmap(flag_lifebelt_xpm));
+ fo->load(QPixmap(flagsPath+"flag-info.png"));
+ // Original: xsldbg_output.png
+ fo->setName("info");
+ fo->setToolTip(tr("Info","Standardflag"));
+ standardFlagsDefault->addFlag (fo);
+
+ fo->load(QPixmap(flagsPath+"flag-lifebelt.png"));
+ // Original khelpcenter.png
fo->setName("lifebelt");
fo->setToolTip(tr("This will help","Standardflag"));
standardFlagsDefault->addFlag (fo);
@@ -1235,14 +1235,6 @@
connect( a, SIGNAL( activated() ), this, SLOT( fileExportXML() ) );
a->addTo( exportMenu );
- if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false))
- {
- a = new QAction( tr( "Export as")+" HTML" , QPixmap(), "HTML...", 0, this, "exportHTML");
- connect( a, SIGNAL( activated() ), this, SLOT( fileExportHTML() ) );
- a->addTo( exportMenu );
- }
-
-
// Context menu for canvas
canvasContextMenu =new QPopupMenu (this);
actionEditMapInfo->addTo( canvasContextMenu );
@@ -1878,26 +1870,6 @@
}
}
-void Main::fileExportHTML()
-{
- MapEditor *me=currentMapEditor();
- if (me)
- {
- ExportHTMLDialog dia(this);
-
- if (dia.exec()==QDialog::Accepted)
- {
- QString dir=dia.getDir();
- if (reallyWriteDirectory(dir) )
- {
- me->setExportMode (true);
- me->exportXML (dia.getDir() );
- dia.doExport(me->getMapName() );
- me->setExportMode (false);
- }
- }
- }
-}
void Main::fileExportXHTML()
{
diff -r 2a6157d381fe -r 4c3e9fa0093b mainwindow.h
--- a/mainwindow.h Mon Apr 10 11:00:19 2006 +0000
+++ b/mainwindow.h Mon Apr 10 11:00:23 2006 +0000
@@ -69,7 +69,6 @@
void fileImportMM();
void fileImportDir();
void fileExportXML();
- void fileExportHTML();
void fileExportXHTML();
void fileExportImage(int);
void fileExportASCII();
diff -r 2a6157d381fe -r 4c3e9fa0093b mapeditor.cpp
--- a/mapeditor.cpp Mon Apr 10 11:00:19 2006 +0000
+++ b/mapeditor.cpp Mon Apr 10 11:00:23 2006 +0000
@@ -125,6 +125,8 @@
extern Settings settings;
+extern QString iconPath;
+
int MapEditor::mapNum=0; // make instance
///////////////////////////////////////////////////////////////////////
@@ -168,22 +170,13 @@
// Create bitmap cursors, patform dependant
#if defined(Q_OS_MACX)
- #include "icons/cursorhandopen16.xpm"
- #include "icons/cursorcolorpicker16.xpm"
- QBitmap cb( 16, 16, chandopen, TRUE );
- QBitmap cm( 16, 16, chandopenmask, TRUE );
- handOpenCursor=QCursor ( cb, cm );
+ handOpenCursor=QCursor ( QPixmap(iconPath+"cursorhandopen16.png") );
// set hot spot to tip of picker
- pickColorCursor=QCursor ( cursorcolorpicker_xpm, 1,15 );
+ pickColorCursor=QCursor ( QPixmap (iconPath+"cursorcolorpicker16.png"), 1,15 );
#else
- #include "icons/cursorhandopen.xpm"
- #include "icons/cursorcolorpicker.xpm"
-
- QBitmap cb( 32, 32, chandopen, TRUE );
- QBitmap cm( 32, 32, chandopenmask, TRUE );
- handOpenCursor=QCursor ( cb, cm );
+ handOpenCursor=QCursor (QPixmap(iconPath+"cursorhandopen16.png"));
// set hot spot to tip of picker
- pickColorCursor=QCursor ( cursorcolorpicker_xpm, 5,27 );
+ pickColorCursor=QCursor ( QPixmap(iconPath+"cursorcolorpicker.png"), 5,27 );
#endif
pickingColor=false;
diff -r 2a6157d381fe -r 4c3e9fa0093b texteditor.cpp
--- a/texteditor.cpp Mon Apr 10 11:00:19 2006 +0000
+++ b/texteditor.cpp Mon Apr 10 11:00:23 2006 +0000
@@ -31,32 +31,14 @@
#include "noteobj.h"
#include "version.h"
-#include "icons/fileopen.xpm"
-#include "icons/filesave.xpm"
-#include "icons/fileprint.xpm"
-#include "icons/editundo.xpm"
-#include "icons/editredo.xpm"
-#include "icons/editcopy.xpm"
-#include "icons/editcut.xpm"
-#include "icons/editpaste.xpm"
-#include "icons/edittrash.xpm"
-#include "icons/formatfixedfont.xpm"
-#include "icons/formattextbold.xpm"
-#include "icons/formattextitalic.xpm"
-#include "icons/formattextunder.xpm"
-#include "icons/formattextleft.xpm"
-#include "icons/formattextcenter.xpm"
-#include "icons/formattextright.xpm"
-#include "icons/formattextjustify.xpm"
-#include "icons/formattextsub.xpm"
-#include "icons/formattextsuper.xpm"
-
extern QCanvas* actCanvas;
extern int statusbarTime;
extern QSettings settings;
extern QAction *actionViewToggleNoteEditor;
+extern QString iconPath;
+
using namespace std;
@@ -245,7 +227,7 @@
menuBar()->insertItem( tr( "&File" ), menu );
QAction *a;
- a = new QAction( tr( "Import" ), QPixmap( fileopen_xpm), tr( "&Import..." ), CTRL + Key_O, this, "fileImport" );
+ a = new QAction( tr( "Import" ), QPixmap( iconPath+"fileopen.png"), tr( "&Import..." ), CTRL + Key_O, this, "fileImport" );
connect( a, SIGNAL( activated() ), this, SLOT( textLoad() ) );
a->setEnabled(false);
a->addTo( tb );
@@ -253,7 +235,7 @@
actionFileLoad=a;
menu->insertSeparator();
- a = new QAction( tr( "Export Note (HTML)" ), QPixmap( filesave_xpm ), tr( "&Export..." ), CTRL + Key_S, this, "fileSave" );
+ a = new QAction( tr( "Export Note (HTML)" ), QPixmap(iconPath+"filesave.png" ), tr( "&Export..." ), CTRL + Key_S, this, "fileSave" );
connect( a, SIGNAL( activated() ), this, SLOT( textSave() ) );
a->addTo( tb );
a->addTo( menu );
@@ -270,7 +252,7 @@
actionFileSaveAs=a;
menu->insertSeparator();
- a = new QAction( tr( "Print Note" ), QPixmap( fileprint_xpm ), tr( "&Print..." ), CTRL + Key_P, this, "filePrint" );
+ a = new QAction( tr( "Print Note" ), QPixmap(iconPath+"fileprint.png" ), tr( "&Print..." ), CTRL + Key_P, this, "filePrint" );
connect( a, SIGNAL( activated() ), this, SLOT( textPrint() ) );
a->addTo( tb );
a->addTo( menu );
@@ -285,13 +267,13 @@
menuBar()->insertItem( tr( "&Edit" ), menu );
QAction *a;
- a = new QAction( tr( "Undo" ), QPixmap(editundo_xpm), tr( "&Undo" ), CTRL + Key_Z, this, "undoEvent" );
+ a = new QAction( tr( "Undo" ), QPixmap(iconPath+"undo.png"), tr( "&Undo" ), CTRL + Key_Z, this, "undoEvent" );
connect( a, SIGNAL( activated() ), e, SLOT( undo() ) );
a->addTo( menu );
a->addTo( tb);
actionEditUndo=a;
- a = new QAction( tr( "Redo" ), QPixmap( editredo_xpm ), tr( "&Redo" ), CTRL + Key_Y, this, "editRedo" );
+ a = new QAction( tr( "Redo" ), QPixmap(iconPath+"redo.png" ), tr( "&Redo" ), CTRL + Key_Y, this, "editRedo" );
connect( a, SIGNAL( activated() ), e, SLOT( redo() ) );
a->addTo( tb );
a->addTo( menu );
@@ -303,25 +285,25 @@
a->addTo( menu );
menu->insertSeparator();
- a = new QAction( tr( "Copy" ), QPixmap( editcopy_xpm ), tr( "&Copy" ), CTRL + Key_C, this, "editCopy" );
+ a = new QAction( tr( "Copy" ), QPixmap(iconPath+"editcopy.png" ), tr( "&Copy" ), CTRL + Key_C, this, "editCopy" );
connect( a, SIGNAL( activated() ), e, SLOT( copy() ) );
a->addTo( tb );
a->addTo( menu );
actionEditCopy=a;
- a = new QAction( tr( "Cut" ), QPixmap( editcut_xpm ), tr( "Cu&t" ), CTRL + Key_X, this, "editCut" );
+ a = new QAction( tr( "Cut" ), QPixmap(iconPath+"editcut.png" ), tr( "Cu&t" ), CTRL + Key_X, this, "editCut" );
connect( a, SIGNAL( activated() ), e, SLOT( cut() ) );
a->addTo( tb );
a->addTo( menu );
actionEditCut=a;
- a = new QAction( tr( "Paste" ), QPixmap( editpaste_xpm ), tr( "&Paste" ), CTRL + Key_V, this, "editPaste" );
+ a = new QAction( tr( "Paste" ), QPixmap(iconPath+"editpaste.png" ), tr( "&Paste" ), CTRL + Key_V, this, "editPaste" );
connect( a, SIGNAL( activated() ), e, SLOT( paste() ) );
a->addTo( tb );
a->addTo( menu );
actionEditPaste=a;
- a = new QAction( tr( "Delete all" ), QPixmap( edittrash_xpm ), tr( "&Delete All" ), 0, this, "editDeleteAll" );
+ a = new QAction( tr( "Delete all" ), QPixmap( iconPath+"edittrash.png"), tr( "&Delete All" ), 0, this, "editDeleteAll" );
connect( a, SIGNAL( activated() ), e, SLOT( clear() ) );
a->addTo( tb );
a->addTo( menu );
@@ -347,7 +329,7 @@
QAction *a;
- a = new QAction( tr( "Toggle font hint for the whole text" ), QPixmap(formatfixedfont_xpm), tr( "&Font hint" ), ALT + Key_I, this, "fontHint" );
+ a = new QAction( tr( "Toggle font hint for the whole text" ), QPixmap(iconPath+"formatfixedfont.png"), tr( "&Font hint" ), ALT + Key_I, this, "fontHint" );
a->setToggleAction (true);
a->setOn (settings.readBoolEntry ("/vym/noteeditor/fonts/useFixedByDefault",false) );
connect( a, SIGNAL( activated() ), this, SLOT( toggleFonthint() ) );
@@ -382,17 +364,17 @@
actionTextColor->addTo( tb );
actionTextColor->addTo( menu );
- actionTextBold = new QAction( QPixmap (formattextbold_xpm), tr( "&Bold" ), CTRL + Key_B, this, "textBold" );
+ actionTextBold = new QAction( QPixmap (iconPath+"text_bold.png"), tr( "&Bold" ), CTRL + Key_B, this, "textBold" );
connect( actionTextBold, SIGNAL( activated() ), this, SLOT( textBold() ) );
actionTextBold->addTo( tb );
actionTextBold->addTo( menu );
actionTextBold->setToggleAction( true );
- actionTextItalic = new QAction( QPixmap(formattextitalic_xpm ), tr( "&Italic" ), CTRL + Key_I, this, "textItalic" );
+ actionTextItalic = new QAction( QPixmap(iconPath+"text_italic.png"), tr( "&Italic" ), CTRL + Key_I, this, "textItalic" );
connect( actionTextItalic, SIGNAL( activated() ), this, SLOT( textItalic() ) );
actionTextItalic->addTo( tb );
actionTextItalic->addTo( menu );
actionTextItalic->setToggleAction( true );
- actionTextUnderline = new QAction( QPixmap (formattextunder_xpm ), tr( "&Underline" ), CTRL + Key_U, this, "textUnderline" );
+ actionTextUnderline = new QAction( QPixmap (iconPath+"text_italic.png"), tr( "&Underline" ), CTRL + Key_U, this, "textUnderline" );
connect( actionTextUnderline, SIGNAL( activated() ), this, SLOT( textUnderline() ) );
actionTextUnderline->addTo( tb );
actionTextUnderline->addTo( menu );
@@ -402,13 +384,13 @@
QActionGroup *grp = new QActionGroup( this );
connect( grp, SIGNAL( selected( QAction* ) ), this, SLOT( textAlign( QAction* ) ) );
- actionAlignLeft = new QAction( QPixmap (formattextleft_xpm ), tr( "&Left" ), CTRL + Key_L, grp, "textLeft" );
+ actionAlignLeft = new QAction( QPixmap (iconPath+"text_left.png"), tr( "&Left" ), CTRL + Key_L, grp, "textLeft" );
actionAlignLeft->setToggleAction( true );
- actionAlignCenter = new QAction( QPixmap (formattextcenter_xpm ), tr( "C&enter" ), CTRL + Key_E, grp, "textCenter" );
+ actionAlignCenter = new QAction( QPixmap (iconPath+"text_center.png"), tr( "C&enter" ), CTRL + Key_E, grp, "textCenter" );
actionAlignCenter->setToggleAction( true );
- actionAlignRight = new QAction( QPixmap (formattextright_xpm ), tr( "&Right" ), CTRL + Key_R, grp, "textRight" );
+ actionAlignRight = new QAction( QPixmap (iconPath+"text_right.png" ), tr( "&Right" ), CTRL + Key_R, grp, "textRight" );
actionAlignRight->setToggleAction( true );
- actionAlignJustify = new QAction( QPixmap ( formattextjustify_xpm ), tr( "&Justify" ), CTRL + Key_J, grp, "textjustify" );
+ actionAlignJustify = new QAction( QPixmap ( iconPath+"text_block.png"), tr( "&Justify" ), CTRL + Key_J, grp, "textjustify" );
actionAlignJustify->setToggleAction( true );
grp->addTo( tb );
@@ -416,12 +398,12 @@
QActionGroup *grp2 = new QActionGroup( this );
grp2->setExclusive(false);
- actionAlignSubScript = new QAction( QPixmap (formattextsub_xpm ), tr( "Subs&cript" ), CTRL + SHIFT + Key_B, grp2, "textSubscript" );
+ actionAlignSubScript = new QAction( QPixmap (iconPath+"text_sub.png"), tr( "Subs&cript" ), CTRL + SHIFT + Key_B, grp2, "textSubscript" );
actionAlignSubScript->setToggleAction( true );
connect(actionAlignSubScript, SIGNAL(activated()), this, SLOT(textVAlign()));
- actionAlignSuperScript = new QAction( QPixmap (formattextsuper_xpm ), tr( "Su&perscript" ), CTRL + SHIFT + Key_P, grp2, "textSuperscript" );
+ actionAlignSuperScript = new QAction( QPixmap (iconPath+"text_super.png"), tr( "Su&perscript" ), CTRL + SHIFT + Key_P, grp2, "textSuperscript" );
actionAlignSuperScript->setToggleAction( true );
connect(actionAlignSuperScript, SIGNAL(activated()), this, SLOT(textVAlign()));
diff -r 2a6157d381fe -r 4c3e9fa0093b version.h
--- a/version.h Mon Apr 10 11:00:19 2006 +0000
+++ b/version.h Mon Apr 10 11:00:23 2006 +0000
@@ -2,7 +2,7 @@
#define VERSION_H
#define __VYM "VYM"
-#define __VYM_VERSION "1.7.13"
-#define __BUILD_DATE "March 28, 2006"
+#define __VYM_VERSION "1.7.14"
+#define __BUILD_DATE "April 3, 2006"
#endif
diff -r 2a6157d381fe -r 4c3e9fa0093b vym.pro
--- a/vym.pro Mon Apr 10 11:00:19 2006 +0000
+++ b/vym.pro Mon Apr 10 11:00:23 2006 +0000
@@ -69,8 +69,7 @@
settings.cpp \
options.cpp
-FORMS = exporthtmldialog.ui \
- exportxhtmldialog.ui \
+FORMS = exportxhtmldialog.ui \
showtextdialog.ui \
extrainfodialog.ui \
editxlinkdialog.ui
@@ -88,15 +87,15 @@
target.path = $${DESTROOT}/bin
INSTALLS += target
-support.files = styles/ scripts/ icons/ lang/
+support.files = styles/ scripts/ icons/ flags/ lang/
support.path = $${DESTROOT}/share/vym
INSTALLS += support
-doc.files = doc/*
+doc.files = tex/vym.pdf
doc.path = $${DESTROOT}/share/doc/packages/vym
INSTALLS += doc
demo.files = demos/
-demo.path = $${DESTROOT}/share/vym
+demo.path = $${DESTROOT}/share/doc/packages/vym
INSTALLS += demo