# HG changeset patch # User insilmaril # Date 1158846485 0 # Node ID bb94eec7c8f319e407061cbf892f03bd7e184197 # Parent 3a58c9ef4a18c71513d35abdb99711661f1a6035 Added universal support for Mac diff -r 3a58c9ef4a18 -r bb94eec7c8f3 demos/liveform.vym Binary file demos/liveform.vym has changed diff -r 3a58c9ef4a18 -r bb94eec7c8f3 demos/todo.vym Binary file demos/todo.vym has changed diff -r 3a58c9ef4a18 -r bb94eec7c8f3 mainwindow.cpp --- a/mainwindow.cpp Thu Sep 14 11:38:18 2006 +0000 +++ b/mainwindow.cpp Thu Sep 21 13:48:05 2006 +0000 @@ -1952,7 +1952,7 @@ void Main::fileLoad(const LoadMode &lmode) { QStringList filters; - filters <<"XML (*.xml)"<<"VYM map (*.vym *.vyp)"; + filters <<"VYM map (*.vym *.vyp)"<<"XML (*.xml)"; QFileDialog *fd=new QFileDialog( this); fd->setDir (lastFileDir); fd->setFileMode (QFileDialog::ExistingFiles); diff -r 3a58c9ef4a18 -r bb94eec7c8f3 texteditor.cpp --- a/texteditor.cpp Thu Sep 14 11:38:18 2006 +0000 +++ b/texteditor.cpp Thu Sep 21 13:48:05 2006 +0000 @@ -210,6 +210,7 @@ void TextEditor::setupFileActions() { QToolBar *tb = addToolBar ( tr("Note Actions") ); + tb->setObjectName ("noteEditorFileActions"); QMenu *fileMenu = menuBar()->addMenu( tr( "&Note" )); QAction *a; @@ -256,6 +257,7 @@ void TextEditor::setupEditActions() { QToolBar *tb = addToolBar ( tr( "Edit Actions" )); + tb->setObjectName ("noteEditorEditActions"); QMenu *editMenu = menuBar()->addMenu ( tr( "&Edit" )); QAction *a; @@ -319,6 +321,7 @@ void TextEditor::setupFormatActions() { QToolBar *tb = addToolBar ( tr("Format Actions" )); + tb->setObjectName ("noteEditorFormatActions"); QMenu *formatMenu = menuBar()->addMenu ( tr( "F&ormat" )); QAction *a; @@ -433,20 +436,6 @@ tb->addAction (a); formatMenu->addAction (a); actionAlignJustify=a; - - - - /* FIXME - connect( e, SIGNAL( currentFontChanged( const QFont & ) ), - this, SLOT( fontChanged( const QFont & ) ) ); - connect( e, SIGNAL( currentColorChanged( const QColor & ) ), - this, SLOT( colorChanged( const QColor & ) ) ); - connect( e, SIGNAL( currentAlignmentChanged( int ) ), - this, SLOT( alignmentChanged( int ) ) ); - connect( e, SIGNAL( currentVerticalAlignmentChanged(int)), - this, SLOT( verticalAlignmentChanged(int))); - */ - } void TextEditor::setupSettingsActions() diff -r 3a58c9ef4a18 -r bb94eec7c8f3 vym.pro --- a/vym.pro Thu Sep 14 11:38:18 2006 +0000 +++ b/vym.pro Thu Sep 21 13:48:05 2006 +0000 @@ -2,6 +2,8 @@ LANGUAGE = C++ CONFIG += qt warn_on release +CONFIG += x86 ppc + QT += qt3support HEADERS += \