aboutsummaryrefslogtreecommitdiffstats
path: root/SQLiteStudio3/guiSQLiteStudio/iconmanager.h
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2016-06-13 18:42:57 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2016-06-13 18:42:57 -0400
commit65d5f68cc6dc81799c5a5d90400a2c1f0dd02547 (patch)
tree6f245ba901b87ef42fed69965aea22f5eea6b590 /SQLiteStudio3/guiSQLiteStudio/iconmanager.h
parentaeb6bad01630d325a4e768e798a7a6d44e18fdaf (diff)
parent5d9314f134ddd3dc4c853e398ac90ba247fb2e4f (diff)
Merge tag 'upstream/3.1.0'
Upstream version 3.1.0 # gpg: Signature made Mon 13 Jun 2016 06:42:54 PM EDT using RSA key ID EBE9BD91 # gpg: Good signature from "Unit 193 <unit193@gmail.com>" # gpg: aka "Unit 193 <unit193@ninthfloor.org>" # gpg: aka "Unit 193 <unit193@ubuntu.com>" # gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/iconmanager.h')
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/iconmanager.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/iconmanager.h b/SQLiteStudio3/guiSQLiteStudio/iconmanager.h
index 648e173..7547712 100644
--- a/SQLiteStudio3/guiSQLiteStudio/iconmanager.h
+++ b/SQLiteStudio3/guiSQLiteStudio/iconmanager.h
@@ -118,6 +118,8 @@ class GUI_API_EXPORT IconManager : public QObject
DEF_ICON(FUNCTION, "function")
DEF_ICON(GET_UPDATE, "get_update")
DEF_ICON(GO_BACK, "go_back")
+ DEF_ICON(GENERATE_COLUMNS, "wand")
+ DEF_ICO3(GENERATE_QUERY, GENERATE_COLUMNS)
DEF_ICON(HELP, "help")
DEF_ICON(HOMEPAGE, "homepage")
DEF_ICON(IMPORT, "import")
@@ -131,6 +133,9 @@ class GUI_API_EXPORT IconManager : public QObject
DEF_ICON(INDICATOR_INFO, "indicator_info")
DEF_ICON(INDICATOR_WARN, "indicator_warn")
DEF_ICON(INFO_BALLOON, "info_balloon")
+ DEF_ICON(INDEX_EXPR_ADD, "tag_hash_add")
+ DEF_ICON(INDEX_EXPR_EDIT, "tag_hash_edit")
+ DEF_ICON(INDEX_EXPR_DEL, "tag_hash_del")
DEF_ICON(INSERT_ROW, "insert_row")
DEF_ICON(INSERT_ROWS, "insert_rows")
DEF_ICO3(INSERT_FN_ARG, INSERT_ROW)
@@ -274,6 +279,9 @@ class GUI_API_EXPORT IconManager : public QObject
public slots:
void rescanResources(const QString& pluginName = QString());
+
+ signals:
+ void rescannedFor(const QString& pluginName);
};
#define ICONMANAGER IconManager::getInstance()