diff -r 9dd536c1ce39 -r 113eb6446c61 gui.cpp --- a/gui.cpp Wed Mar 20 13:41:08 2013 +0200 +++ b/gui.cpp Wed Mar 20 19:41:37 2013 +0200 @@ -27,6 +27,7 @@ #include "zz_configDialog.h" #include "zz_addObjectDialog.h" #include "misc.h" +#include "zz_colorSelectDialog.h" #define MAKE_ACTION(OBJECT, DISPLAYNAME, IMAGENAME, DESCR) \ qAct_##OBJECT = new QAction (QIcon ("./icons/" IMAGENAME ".png"), tr (DISPLAYNAME), this); \ @@ -108,6 +109,8 @@ MAKE_ACTION (about, sAboutText, "ldforge", "Shows information about " APPNAME_DISPLAY ".") MAKE_ACTION (aboutQt, "About Qt", "aboutQt", "Shows information about Qt.") + MAKE_ACTION (testColorSelect, "Test colors", "palette", "Test the color selection dialog") + // Keyboard shortcuts qAct_new->setShortcut (Qt::CTRL | Qt::Key_N); qAct_open->setShortcut (Qt::CTRL | Qt::Key_O); @@ -203,6 +206,7 @@ qEditToolBar->addAction (qAct_inline); qEditToolBar->addAction (qAct_splitQuads); qEditToolBar->addAction (qAct_setContents); + qEditToolBar->addAction (qAct_testColorSelect); addToolBar (qEditToolBar); } @@ -541,4 +545,9 @@ void ForgeWindow::refresh () { buildObjList (); R->hardRefresh (); +} + +void ForgeWindow::slot_testColorSelect () { + ColorSelectDialog dlg; + dlg.exec (); } \ No newline at end of file