1.1 --- a/highlighter.cpp Wed May 02 15:31:17 2007 +0000
1.2 +++ b/highlighter.cpp Wed May 02 15:31:17 2007 +0000
1.3 @@ -58,6 +58,11 @@
1.4 << "\\bselect\\b"
1.5 << "\\bselectLastBranch\\b"
1.6 << "\\bselectLastImage\\b"
1.7 + << "\\bsetFrameType\\b"
1.8 + << "\\bsetFramePenColor\\b"
1.9 + << "\\bsetFrameBrushColor\\b"
1.10 + << "\\bsetFramePadding\\b"
1.11 + << "\\bsetFrameBorderWidth\\b"
1.12 << "\\bsetMapAuthor\\b"
1.13 << "\\bsetMapComment\\b"
1.14 << "\\bsetMapBackgroundColor\\b"
2.1 --- a/historywindow.cpp Wed May 02 15:31:17 2007 +0000
2.2 +++ b/historywindow.cpp Wed May 02 15:31:17 2007 +0000
2.3 @@ -34,24 +34,13 @@
2.4 connect ( ui.historyTable, SIGNAL (itemSelectionChanged()), this, SLOT (select()));
2.5
2.6 // Load Settings
2.7 - resize (settings.value ( "/historywindow/geometry/size", QSize(450,600)).toSize());
2.8 - move (settings.value ( "/historywindow/geometry/pos", QPoint (250,50)).toPoint());
2.9
2.10 for (int i=0; i<3; ++i)
2.11 ui.historyTable->setColumnWidth (i,settings.value( QString("/historywindow/geometry/columnWidth/%1").arg(i),150).toInt());
2.12 -
2.13 - if (settings.value ( "/historywindow/showWithMain",false).toBool())
2.14 - setShowWithMain(true);
2.15 - else
2.16 - setShowWithMain(false);
2.17 -
2.18 }
2.19
2.20 HistoryWindow::~HistoryWindow()
2.21 {
2.22 - settings.setValue( "/historywindow/geometry/size", size() );
2.23 - settings.setValue( "/historywindow/geometry/pos", pos() );
2.24 - settings.setValue( "/historywindow/showWithMain",showWithMain());
2.25 for (int i=0; i<3; ++i)
2.26 settings.setValue( QString("/historywindow/geometry/columnWidth/%1").arg(i), ui.historyTable->columnWidth (i) );
2.27 }
2.28 @@ -153,23 +142,10 @@
2.29
2.30 }
2.31
2.32 -void HistoryWindow::setShowWithMain (bool v)
2.33 +
2.34 +void HistoryWindow::closeEvent (QCloseEvent *ce)
2.35 {
2.36 - showwithmain=v;
2.37 -}
2.38 -
2.39 -void HistoryWindow::closeEvent( QCloseEvent* ce )
2.40 -{
2.41 - ce->accept(); // TextEditor can be reopened with show()
2.42 - showwithmain=false;
2.43 emit (windowClosed() );
2.44 - return;
2.45 -}
2.46 -
2.47 -
2.48 -bool HistoryWindow::showWithMain()
2.49 -{
2.50 - return showwithmain;
2.51 }
2.52
2.53 void HistoryWindow::undo()