diff --git a/pglab/QueryToolModule.cpp b/pglab/QueryToolModule.cpp index 6be8ec9..55d7406 100644 --- a/pglab/QueryToolModule.cpp +++ b/pglab/QueryToolModule.cpp @@ -26,39 +26,39 @@ void QueryToolModule::init() } { LWidgetAction wa("Save SQL", SLOT(save())); - wa.setMenuLocation(MenuPath("File/Save")); - wa.setIcon(QIcon(":/icons/script_save.png")); + wa.setMenuLocation("File/Save"); + wa.setIcon(":/icons/script_save.png"); wa.setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S)); registerWidgetAction(wa); } { LWidgetAction wa("Save SQL as", SLOT(saveAs())); - wa.setMenuLocation(MenuPath("File/Save")); - wa.setIcon(QIcon(":/icons/script_save.png")); + wa.setMenuLocation("File/Save"); + wa.setIcon(":/icons/script_save.png"); registerWidgetAction(wa); } { LWidgetAction wa("Execute", SLOT(execute())); - wa.setMenuLocation(MenuPath("Query/1")); - wa.setIcon(QIcon(":/icons/script_go.png")); + wa.setMenuLocation("Query/1"); + wa.setIcon(":/icons/script_go.png"); registerWidgetAction(wa); } { LWidgetAction wa("Explain", SLOT(explain())); - wa.setMenuLocation(MenuPath("Query/2")); - wa.setIcon(QIcon(":/icons/lightbulb_off.png")); + wa.setMenuLocation("Query/2"); + wa.setIcon(":/icons/lightbulb_off.png"); registerWidgetAction(wa); } { LWidgetAction wa("Analyze", SLOT(analyze())); - wa.setMenuLocation(MenuPath("Query/1")); - wa.setIcon(QIcon(":/icons/lightbulb.png")); + wa.setMenuLocation("Query/1"); + wa.setIcon(":/icons/lightbulb.png"); registerWidgetAction(wa); } { LWidgetAction wa("Cancel", SLOT(cancel())); - wa.setMenuLocation(MenuPath("Query/1")); - wa.setIcon(QIcon(":/icons/script_delete.png")); + wa.setMenuLocation("Query/1"); + wa.setIcon(":/icons/script_delete.png"); registerWidgetAction(wa); } } diff --git a/pglab/plugin_support/LWidgetAction.h b/pglab/plugin_support/LWidgetAction.h index 263c21a..3169061 100644 --- a/pglab/plugin_support/LWidgetAction.h +++ b/pglab/plugin_support/LWidgetAction.h @@ -20,7 +20,9 @@ public: const QIcon& icon() const; const MenuLocation& menuLocation() const; void setIcon(QIcon icon); + void setIcon(const char * icon) { setIcon(QIcon(icon)); } void setMenuLocation(MenuLocation menu_location); + void setMenuLocation(const char * menu_location) { setMenuLocation(MenuPath(menu_location)); } void setShortcut(QKeySequence shortcut); void setText(QString text); void setToolTip(QString tooltip);